Merge tag 'efi-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming...

[platform/upstream/kernel-adaptation-pc.git] / arch / x86 / kernel / setup.c

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 6fd7752..ca45696 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -920,8 +920,22 @@ void __init setup_arch(char **cmdline_p)
 
 #ifdef CONFIG_X86_64
        if (max_pfn > max_low_pfn) {
-               max_pfn_mapped = init_memory_mapping(1UL<<32,
-                                                    max_pfn<<PAGE_SHIFT);
+               int i;
+               unsigned long start, end;
+               unsigned long start_pfn, end_pfn;
+
+               for_each_mem_pfn_range(i, MAX_NUMNODES, &start_pfn, &end_pfn,
+                                                        NULL) {
+
+                       end = PFN_PHYS(end_pfn);
+                       if (end <= (1UL<<32))
+                               continue;
+
+                       start = PFN_PHYS(start_pfn);
+                       max_pfn_mapped = init_memory_mapping(
+                                               max((1UL<<32), start), end);
+               }
+
                /* can we preseve max_low_pfn ?*/
                max_low_pfn = max_pfn;
        }