diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-29 14:43:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-29 14:43:30 -0400 |
| commit | eefbab599531240adaffa1d23900afbc8b0342bd (patch) | |
| tree | 2beb38a94aca40c7e5a0396503968d041e584bf9 /mm/percpu.c | |
| parent | 90f1e7481eebfd47e7dbf7c8c0cbfe31e025e031 (diff) | |
| parent | 3062aa50a6b2c3103470178fe7506c450d79ebe5 (diff) | |
Merge branch 'frv' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-frv
* 'frv' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-frv:
FRV: Use generic show_interrupts()
FRV: Convert genirq namespace
frv: Select GENERIC_HARDIRQS_NO_DEPRECATED
frv: Convert cpu irq_chip to new functions
frv: Convert mb93493 irq_chip to new functions
frv: Convert mb93093 irq_chip to new function
frv: Convert mb93091 irq_chip to new functions
frv: Fix typo from __do_IRQ overhaul
frv: Remove stale irq_chip.end
FRV: Do some cleanups
FRV: Missing node arg in alloc_thread_info_node() macro
NOMMU: implement access_remote_vm
NOMMU: support SMP dynamic percpu_alloc
NOMMU: percpu should use is_vmalloc_addr().
Diffstat (limited to 'mm/percpu.c')
| -rw-r--r-- | mm/percpu.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mm/percpu.c b/mm/percpu.c index 3f930018aa6..55d4d113fbd 100644 --- a/mm/percpu.c +++ b/mm/percpu.c | |||
| @@ -1008,8 +1008,7 @@ phys_addr_t per_cpu_ptr_to_phys(void *addr) | |||
| 1008 | } | 1008 | } |
| 1009 | 1009 | ||
| 1010 | if (in_first_chunk) { | 1010 | if (in_first_chunk) { |
| 1011 | if ((unsigned long)addr < VMALLOC_START || | 1011 | if (!is_vmalloc_addr(addr)) |
| 1012 | (unsigned long)addr >= VMALLOC_END) | ||
| 1013 | return __pa(addr); | 1012 | return __pa(addr); |
| 1014 | else | 1013 | else |
| 1015 | return page_to_phys(vmalloc_to_page(addr)); | 1014 | return page_to_phys(vmalloc_to_page(addr)); |