summaryrefslogtreecommitdiff
path: root/linux/drm_proc.h
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2002-12-12 16:45:31 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2002-12-12 16:45:31 +0000
commit786228bd26d56c13fc2655431ee5ca2d4d0c9863 (patch)
treeaca4bc295550c9740a43ec763881986e0b55a553 /linux/drm_proc.h
parentfd621fd4a0c0033365353b6d33f132c7ef49b359 (diff)
bring in jantorial changes from 2.5.51
Diffstat (limited to 'linux/drm_proc.h')
-rw-r--r--linux/drm_proc.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/linux/drm_proc.h b/linux/drm_proc.h
index 24e8556f..d29db7b7 100644
--- a/linux/drm_proc.h
+++ b/linux/drm_proc.h
@@ -449,7 +449,8 @@ static int DRM(_vma_info)(char *buf, char **start, off_t offset, int request,
for (i = vma->vm_start; i < vma->vm_end; i += PAGE_SIZE) {
pgd = pgd_offset(vma->vm_mm, i);
pmd = pmd_offset(pgd, i);
- pte = pte_offset(pmd, i);
+ preempt_disable();
+ pte = pte_offset_map(pmd, i);
if (pte_present(*pte)) {
address = __pa(pte_page(*pte))
+ (i & (PAGE_SIZE-1));
@@ -465,6 +466,8 @@ static int DRM(_vma_info)(char *buf, char **start, off_t offset, int request,
} else {
DRM_PROC_PRINT(" 0x%08lx\n", i);
}
+ pte_unmap(pte);
+ preempt_enable();
}
#endif
}