diff options
| author | Michel Daenzer <michel@daenzer.net> | 2002-12-14 17:42:48 +0000 |
|---|---|---|
| committer | Michel Daenzer <michel@daenzer.net> | 2002-12-14 17:42:48 +0000 |
| commit | c4c614eaac083572a8123b720f1d6e87272797bf (patch) | |
| tree | dd2519823116b9a4b333c7528f79c2628b6a93b1 /linux/drm_proc.h | |
| parent | c869f4a1e59c4fa0bed5681cad5ad49e685603eb (diff) | |
merge changes from trunk since Mesa 5.0 mergemesa-4-0-4-20021214
Diffstat (limited to 'linux/drm_proc.h')
| -rw-r--r-- | linux/drm_proc.h | 5 |
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 } |