diff options
author | Paul Mundt <lethal@linux-sh.org> | 2007-07-25 02:59:47 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2007-07-26 02:35:17 -0400 |
commit | b067c50a7f58838d8a53670ea3c07e18d7391900 (patch) | |
tree | 28e5d1ebe684ece9f341768157e620124e987517 | |
parent | 3c6b6c7fb7d8876f1c1e07fdb937980f05a98315 (diff) |
sh: Silence sq compile warning on sh4 nommu.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r-- | arch/sh/kernel/cpu/sh4/sq.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/arch/sh/kernel/cpu/sh4/sq.c b/arch/sh/kernel/cpu/sh4/sq.c index b98d6c3e6f3..c21512c6044 100644 --- a/arch/sh/kernel/cpu/sh4/sq.c +++ b/arch/sh/kernel/cpu/sh4/sq.c | |||
@@ -208,7 +208,6 @@ EXPORT_SYMBOL(sq_remap); | |||
208 | void sq_unmap(unsigned long vaddr) | 208 | void sq_unmap(unsigned long vaddr) |
209 | { | 209 | { |
210 | struct sq_mapping **p, *map; | 210 | struct sq_mapping **p, *map; |
211 | struct vm_struct *vma; | ||
212 | int page; | 211 | int page; |
213 | 212 | ||
214 | for (p = &sq_mapping_list; (map = *p); p = &map->next) | 213 | for (p = &sq_mapping_list; (map = *p); p = &map->next) |
@@ -225,11 +224,18 @@ void sq_unmap(unsigned long vaddr) | |||
225 | bitmap_release_region(sq_bitmap, page, get_order(map->size)); | 224 | bitmap_release_region(sq_bitmap, page, get_order(map->size)); |
226 | 225 | ||
227 | #ifdef CONFIG_MMU | 226 | #ifdef CONFIG_MMU |
228 | vma = remove_vm_area((void *)(map->sq_addr & PAGE_MASK)); | 227 | { |
229 | if (!vma) { | 228 | /* |
230 | printk(KERN_ERR "%s: bad address 0x%08lx\n", | 229 | * Tear down the VMA in the MMU case. |
231 | __FUNCTION__, map->sq_addr); | 230 | */ |
232 | return; | 231 | struct vm_struct *vma; |
232 | |||
233 | vma = remove_vm_area((void *)(map->sq_addr & PAGE_MASK)); | ||
234 | if (!vma) { | ||
235 | printk(KERN_ERR "%s: bad address 0x%08lx\n", | ||
236 | __FUNCTION__, map->sq_addr); | ||
237 | return; | ||
238 | } | ||
233 | } | 239 | } |
234 | #endif | 240 | #endif |
235 | 241 | ||