diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-22 19:13:54 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-22 19:13:54 -0500 |
| commit | f01c18456993bab43067b678f56c87ca954aa43b (patch) | |
| tree | 3e0cd0cdf1a57618202b46a7126125902e3ab832 /arch/sparc/mm/generic.c | |
| parent | 949ec2c8e6b7b89179b85baf6309c009e1a1b951 (diff) | |
| parent | 1c2e02750b992703a8a18634e08b04353face243 (diff) | |
Merge branch 'master'
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); |