diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2007-07-25 15:59:47 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2007-07-26 15:35:17 +0900 |
| commit | b067c50a7f58838d8a53670ea3c07e18d7391900 (patch) | |
| tree | 28e5d1ebe684ece9f341768157e620124e987517 | |
| parent | 3c6b6c7fb7d8876f1c1e07fdb937980f05a98315 (diff) | |
| download | kernel_samsung_aries-b067c50a7f58838d8a53670ea3c07e18d7391900.zip kernel_samsung_aries-b067c50a7f58838d8a53670ea3c07e18d7391900.tar.gz kernel_samsung_aries-b067c50a7f58838d8a53670ea3c07e18d7391900.tar.bz2 | |
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 b98d6c3..c21512c 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); void sq_unmap(unsigned long vaddr) { struct sq_mapping **p, *map; - struct vm_struct *vma; int page; for (p = &sq_mapping_list; (map = *p); p = &map->next) @@ -225,11 +224,18 @@ void sq_unmap(unsigned long vaddr) bitmap_release_region(sq_bitmap, page, get_order(map->size)); #ifdef CONFIG_MMU - vma = remove_vm_area((void *)(map->sq_addr & PAGE_MASK)); - if (!vma) { - printk(KERN_ERR "%s: bad address 0x%08lx\n", - __FUNCTION__, map->sq_addr); - return; + { + /* + * Tear down the VMA in the MMU case. + */ + struct vm_struct *vma; + + vma = remove_vm_area((void *)(map->sq_addr & PAGE_MASK)); + if (!vma) { + printk(KERN_ERR "%s: bad address 0x%08lx\n", + __FUNCTION__, map->sq_addr); + return; + } } #endif |