diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-21 09:48:33 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-21 09:48:33 +0200 |
| commit | f70cac8d9c7125f83048f8b3d1c60f5a041a165c (patch) | |
| tree | 0d0efd72c1a41f973a919b16aac1d8210ed1ee30 /arch/arm/mm/init.c | |
| parent | Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stable (diff) | |
| parent | ARM: kprobes: Add introductory comment to test code (diff) | |
| download | linux-f70cac8d9c7125f83048f8b3d1c60f5a041a165c.tar.xz linux-f70cac8d9c7125f83048f8b3d1c60f5a041a165c.zip | |
Merge branch 'kprobes-test' of git://git.yxit.co.uk/linux into devel-stable
Diffstat (limited to 'arch/arm/mm/init.c')
| -rw-r--r-- | arch/arm/mm/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 64ab41348f30..34409a08ba0d 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -298,7 +298,7 @@ static void __init arm_bootmem_free(unsigned long min, unsigned long max_low, #ifdef CONFIG_HAVE_ARCH_PFN_VALID int pfn_valid(unsigned long pfn) { - return memblock_is_memory(pfn << PAGE_SHIFT); + return memblock_is_memory(__pfn_to_phys(pfn)); } EXPORT_SYMBOL(pfn_valid); #endif |