diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-11-28 17:46:32 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-11-28 17:46:32 -0500 |
| commit | a880b11a95fab4618da412d99fc7365d723e702d (patch) | |
| tree | 10839a82741b7154067adfff425dadef3caf4163 /arch/sparc/mm/generic.c | |
| parent | 899a1fc084ef3dcb57737d8847bf219cbf353ed3 (diff) | |
| parent | 458af5439fe7ae7d95ca14106844e61f0795166c (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/sparc/mm/generic.c')
| -rw-r--r-- | arch/sparc/mm/generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/mm/generic.c b/arch/sparc/mm/generic.c index 9604893ffdbd..0410bae681f8 100644 --- a/arch/sparc/mm/generic.c +++ b/arch/sparc/mm/generic.c | |||
| @@ -74,7 +74,7 @@ int io_remap_pfn_range(struct vm_area_struct *vma, unsigned long from, | |||
| 74 | unsigned long offset = GET_PFN(pfn) << PAGE_SHIFT; | 74 | unsigned long offset = GET_PFN(pfn) << PAGE_SHIFT; |
| 75 | 75 | ||
| 76 | /* See comment in mm/memory.c remap_pfn_range */ | 76 | /* See comment in mm/memory.c remap_pfn_range */ |
| 77 | vma->vm_flags |= VM_IO | VM_RESERVED; | 77 | vma->vm_flags |= VM_IO | VM_RESERVED | VM_UNPAGED; |
| 78 | 78 | ||
| 79 | prot = __pgprot(pg_iobits); | 79 | prot = __pgprot(pg_iobits); |
| 80 | offset -= from; | 80 | offset -= from; |