Pull button into test branch

[linux-drm-fsl-dcu.git] / arch / x86_64 / kernel / e820.c

diff --git a/arch/x86_64/kernel/e820.c b/arch/x86_64/kernel/e820.c
index a75c829c2b02b16bf23ea495a326d0307cd9685b..6fe191c5808465ddc7c8673c8996d52a67858d98 100644 (file)
--- a/arch/x86_64/kernel/e820.c
+++ b/arch/x86_64/kernel/e820.c
@@ -278,7 +278,7 @@ e820_register_active_regions(int nid, unsigned long start_pfn,
                                                                >> PAGE_SHIFT;
 
                /* Skip map entries smaller than a page */
-               if (ei_startpfn > ei_endpfn)
+               if (ei_startpfn >= ei_endpfn)
                        continue;
 
                /* Check if end_pfn_map should be updated */
@@ -594,7 +594,9 @@ static int __init parse_memmap_opt(char *p)
                 * size before original memory map is
                 * reset.
                 */
+               e820_register_active_regions(0, 0, -1UL);
                saved_max_pfn = e820_end_of_ram();
+               remove_all_active_ranges();
 #endif
                end_pfn_map = 0;
                e820.nr_map = 0;