Merge branch 'kprobes-test' of git://git.yxit.co.uk/linux into devel-stable

2011-09-21 08:48:33 +01:00
parent 4722cd7741 08aab447c5
commit f70cac8d9c
143 changed files with 6041 additions and 633 deletions
--- 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