Skip to content

L
linux-davinci-2.6.23
Commit b067c50a authored by Paul Mundt's avatar Paul Mundt
Browse files
Options

sh: Silence sq compile warning on sh4 nommu. 

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 3c6b6c7f
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 6 deletions
arch/sh/kernel/cpu/sh4/sq.c
View file @ b067c50a
...@@ -208,7 +208,6 @@ EXPORT_SYMBOL(sq_remap); ...@@ -208,7 +208,6 @@ EXPORT_SYMBOL(sq_remap);
void sq_unmap(unsigned long vaddr) void sq_unmap(unsigned long vaddr)
{ {
struct sq_mapping **p, *map; struct sq_mapping **p, *map;
struct vm_struct *vma;
int page; int page;
for (p = &sq_mapping_list; (map = *p); p = &map->next) for (p = &sq_mapping_list; (map = *p); p = &map->next)
...@@ -225,11 +224,18 @@ void sq_unmap(unsigned long vaddr) ...@@ -225,11 +224,18 @@ void sq_unmap(unsigned long vaddr)
bitmap_release_region(sq_bitmap, page, get_order(map->size)); bitmap_release_region(sq_bitmap, page, get_order(map->size));
#ifdef CONFIG_MMU #ifdef CONFIG_MMU
vma = remove_vm_area((void *)(map->sq_addr & PAGE_MASK)); {
if (!vma) { /*
printk(KERN_ERR "%s: bad address 0x%08lx\n", * Tear down the VMA in the MMU case.
__FUNCTION__, map->sq_addr); */
return; 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 #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment