projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.infradead.org/mtd-2.6
[powerpc.git]
/
drivers
/
char
/
drm
/
drm_proc.c
diff --git
a/drivers/char/drm/drm_proc.c
b/drivers/char/drm/drm_proc.c
index
362a270
..
7fd0da7
100644
(file)
--- a/
drivers/char/drm/drm_proc.c
+++ b/
drivers/char/drm/drm_proc.c
@@
-500,7
+500,7
@@
static int drm__vma_info(char *buf, char **start, off_t offset, int request,
for (pt = dev->vmalist; pt; pt = pt->next) {
if (!(vma = pt->vma))
continue;
for (pt = dev->vmalist; pt; pt = pt->next) {
if (!(vma = pt->vma))
continue;
- DRM_PROC_PRINT("\n%5d 0x%08lx-0x%08lx %c%c%c%c%c%c 0x%08lx",
+ DRM_PROC_PRINT("\n%5d 0x%08lx-0x%08lx %c%c%c%c%c%c 0x%08lx
000
",
pt->pid,
vma->vm_start,
vma->vm_end,
pt->pid,
vma->vm_start,
vma->vm_end,
@@
-510,7
+510,7
@@
static int drm__vma_info(char *buf, char **start, off_t offset, int request,
vma->vm_flags & VM_MAYSHARE ? 's' : 'p',
vma->vm_flags & VM_LOCKED ? 'l' : '-',
vma->vm_flags & VM_IO ? 'i' : '-',
vma->vm_flags & VM_MAYSHARE ? 's' : 'p',
vma->vm_flags & VM_LOCKED ? 'l' : '-',
vma->vm_flags & VM_IO ? 'i' : '-',
-
VM_OFFSET(vma)
);
+
vma->vm_pgoff
);
#if defined(__i386__)
pgprot = pgprot_val(vma->vm_page_prot);
#if defined(__i386__)
pgprot = pgprot_val(vma->vm_page_prot);