diff options
| author | Daryll Strauss <daryll@users.sourceforge.net> | 1999-12-07 03:37:16 +0000 |
|---|---|---|
| committer | Daryll Strauss <daryll@users.sourceforge.net> | 1999-12-07 03:37:16 +0000 |
| commit | e1dba5c3a73078dec24f07a6d685435677db94a4 (patch) | |
| tree | 85df5e4de1dbbbe434e9359e8849325e68c3a79f /linux/proc.c | |
| parent | b6a28bfe98f2c89cfb91079bd3c7b63fb0144eb1 (diff) | |
Move Mesa to xc/extras Update to the latest Mesa 3.2 code Fix the Q3Demo
bugs (white railgun and texture mapping) Simplify driver texture
mapping routines Fix device driver for 2.3 kernels Improve performance
Diffstat (limited to 'linux/proc.c')
| -rw-r--r-- | linux/proc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/linux/proc.c b/linux/proc.c index 0883d718..33a5b20e 100644 --- a/linux/proc.c +++ b/linux/proc.c @@ -1,6 +1,6 @@ /* proc.c -- /proc support for DRM -*- linux-c -*- * Created: Mon Jan 11 09:48:47 1999 by faith@precisioninsight.com - * Revised: Fri Aug 20 11:31:48 1999 by faith@precisioninsight.com + * Revised: Fri Dec 3 09:44:16 1999 by faith@precisioninsight.com * * Copyright 1999 Precision Insight, Inc., Cedar Park, Texas. * All Rights Reserved. @@ -382,7 +382,8 @@ static int _drm_vma_info(char *buf, char **start, off_t offset, int len, vma->vm_flags & VM_MAYSHARE ? 's' : 'p', vma->vm_flags & VM_LOCKED ? 'l' : '-', vma->vm_flags & VM_IO ? 'i' : '-', - vma->vm_offset ); + VM_OFFSET(vma)); + #if defined(__i386__) pgprot = pgprot_val(vma->vm_page_prot); DRM_PROC_PRINT(" %c%c%c%c%c%c%c%c%c", @@ -393,7 +394,7 @@ static int _drm_vma_info(char *buf, char **start, off_t offset, int len, pgprot & _PAGE_PCD ? 'u' : 'c', pgprot & _PAGE_ACCESSED ? 'a' : '-', pgprot & _PAGE_DIRTY ? 'd' : '-', - pgprot & _PAGE_4M ? 'm' : 'k', + pgprot & _PAGE_PSE ? 'm' : 'k', pgprot & _PAGE_GLOBAL ? 'g' : 'l' ); #endif DRM_PROC_PRINT("\n"); |