← Back to branch summary

~helenos-nicf/helenos/nicf

« back to all changes in this revision

Viewing changes to kernel/generic/src/dma/dma_memory.c

  • Committer: Radim Vansa
  • Date: 2011-09-20 21:55:59 UTC
  • mfrom: (697.1.517 HelenOS.mainline)
  • Revision ID: radim.vansa@matfyz.cz-20110920215559-7fjpai6wt5ieurcq
Merge with mainline

Show diffs side-by-side

added added

removed removed

Lines of Context:
kernel/generic/src/dma/dma_memory.c
40
40
 */
41
41
#include <dma/dma_memory.h>
42
42
#include <dma/dma_memory_private.h>
43
 
#include <dma/dma_args.h>
 
43
#include <abi/dma/dma_args.h>
44
44
#include <dma/dma_frame_allocator.h>
45
45
#include <genarch/mm/page_pt.h>
46
46
#include <genarch/mm/page_ht.h>
206
206
                uintptr_t current = 0;
207
207
 
208
208
                page_table_lock(AS, false);
209
 
                p = page_mapping_find(AS, vaddr);
 
209
                p = page_mapping_find(AS, vaddr, false);
210
210
                page_table_unlock(AS, false);
211
211
 
212
212
                if (p != NULL) {
245
245
                         * Try to find mapping again
246
246
                         */
247
247
                        page_table_lock(AS, false);
248
 
                        p = page_mapping_find(AS, vaddr);
 
248
                        p = page_mapping_find(AS, vaddr, false);
249
249
                        page_table_unlock(AS, false);
250
250
                        if (p != NULL) {
251
251
                                current = PTE_GET_FRAME(p);
410
410
        ASSERT(page_table_locked(as) || mutex_locked(&(area->lock)));
411
411
        while ((*size_out) < size_in) {
412
412
 
413
 
                p = page_mapping_find(as, vaddr);
 
413
                p = page_mapping_find(as, vaddr, false);
414
414
                if (p != NULL) {
415
415
                        current = PTE_GET_FRAME(p);
416
416
                } else {