aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2011-03-28 12:53:29 +0100
committerDavid Howells <dhowells@redhat.com>2011-03-28 12:53:29 +0100
commiteac522ef438f8ea173569fd0469371bc5d317947 (patch)
tree890a1a68a65768b9f0de66083e566737a65c8483
parent16c29dafcc86024048f1dbb8349d31cb22c7c55a (diff)
downloadkernel_samsung_espresso10-eac522ef438f8ea173569fd0469371bc5d317947.zip
kernel_samsung_espresso10-eac522ef438f8ea173569fd0469371bc5d317947.tar.gz
kernel_samsung_espresso10-eac522ef438f8ea173569fd0469371bc5d317947.tar.bz2
NOMMU: percpu should use is_vmalloc_addr().
per_cpu_ptr_to_phys() uses VMALLOC_START and VMALLOC_END to determine if an address is in the vmalloc() region or not. This is incorrect on NOMMU as there is no real vmalloc() capability (vmalloc() is emulated by kmalloc()). The correct way to do this is to use is_vmalloc_addr(). This encapsulates the vmalloc() region test in MMU mode and just returns 0 in NOMMU mode. On FRV in NOMMU mode, the percpu compilation fails without this patch: mm/percpu.c: In function 'per_cpu_ptr_to_phys': mm/percpu.c:1011: error: 'VMALLOC_START' undeclared (first use in this function) mm/percpu.c:1011: error: (Each undeclared identifier is reported only once mm/percpu.c:1011: error: for each function it appears in.) mm/percpu.c:1012: error: 'VMALLOC_END' undeclared (first use in this function) mm/percpu.c:1018: warning: control reaches end of non-void function Signed-off-by: David Howells <dhowells@redhat.com>
-rw-r--r--mm/percpu.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/mm/percpu.c b/mm/percpu.c
index 3f93001..55d4d11 100644
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@ -1008,8 +1008,7 @@ phys_addr_t per_cpu_ptr_to_phys(void *addr)
}
if (in_first_chunk) {
- if ((unsigned long)addr < VMALLOC_START ||
- (unsigned long)addr >= VMALLOC_END)
+ if (!is_vmalloc_addr(addr))
return __pa(addr);
else
return page_to_phys(vmalloc_to_page(addr));