diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-22 13:56:57 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-22 13:56:57 -0500 |
| commit | d04ef3a795b3b7b376a02713ed5e211e9ae1f917 (patch) | |
| tree | 837da034751a2fc1be0fc5a105c218d41a498eb6 /arch/sparc/mm/generic.c | |
| parent | 36177ba655c238e33400cc2837a28720b62784bd (diff) | |
| parent | dcc1e8dd88d4bc55e32a26dad7633d20ffe606d2 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Add a secondary TSB for hugepage mappings.
[SPARC]: Respect vm_page_prot in io_remap_page_range().
Diffstat (limited to 'arch/sparc/mm/generic.c')
| -rw-r--r-- | arch/sparc/mm/generic.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sparc/mm/generic.c b/arch/sparc/mm/generic.c index 2cb0728cee05..1ef7fa03fefe 100644 --- a/arch/sparc/mm/generic.c +++ b/arch/sparc/mm/generic.c | |||
| @@ -76,7 +76,6 @@ int io_remap_pfn_range(struct vm_area_struct *vma, unsigned long from, | |||
| 76 | vma->vm_pgoff = (offset >> PAGE_SHIFT) | | 76 | vma->vm_pgoff = (offset >> PAGE_SHIFT) | |
| 77 | ((unsigned long)space << 28UL); | 77 | ((unsigned long)space << 28UL); |
| 78 | 78 | ||
| 79 | prot = __pgprot(pg_iobits); | ||
| 80 | offset -= from; | 79 | offset -= from; |
| 81 | dir = pgd_offset(mm, from); | 80 | dir = pgd_offset(mm, from); |
| 82 | flush_cache_range(vma, beg, end); | 81 | flush_cache_range(vma, beg, end); |