diff --git a/[refs] b/[refs]
index dfe145a1bccc..24b92e8e0165 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b692a872c21849edb0a398937e31991526a9216
+refs/heads/master: 1f50249e940baa7133e0bdb32cd564bb3ba28456
diff --git a/trunk/arch/x86_64/kernel/setup.c b/trunk/arch/x86_64/kernel/setup.c
index 01e2de4d2540..ad3b7fc24a05 100644
--- a/trunk/arch/x86_64/kernel/setup.c
+++ b/trunk/arch/x86_64/kernel/setup.c
@@ -614,6 +614,7 @@ void __init setup_arch(char **cmdline_p)
 	 * we are rounding upwards:
 	 */
 	end_pfn = e820_end_of_ram();
+	num_physpages = end_pfn;		/* for pfn_valid */
 
 	check_efer();