• Dan Williams's avatar
    x86/e820: Don't merge consecutive E820_PRAM ranges · 23446cb6
    Dan Williams authored
    Commit:
    
      917db484 ("x86/boot: Fix kdump, cleanup aborted E820_PRAM max_pfn manipulation")
    
    ... fixed up the broken manipulations of max_pfn in the presence of
    E820_PRAM ranges.
    
    However, it also broke the sanitize_e820_map() support for not merging
    E820_PRAM ranges.
    
    Re-introduce the enabling to keep resource boundaries between
    consecutive defined ranges. Otherwise, for example, an environment that
    boots with memmap=2G!8G,2G!10G will end up with a single 4G /dev/pmem0
    device instead of a /dev/pmem0 and /dev/pmem1 device 2G in size.
    Reported-by: default avatarDave Chinner <david@fromorbit.com>
    Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
    Cc: <stable@vger.kernel.org>
    Cc: Andy Lutomirski <luto@kernel.org>
    Cc: Borislav Petkov <bp@alien8.de>
    Cc: Brian Gerst <brgerst@gmail.com>
    Cc: Denys Vlasenko <dvlasenk@redhat.com>
    Cc: H. Peter Anvin <hpa@zytor.com>
    Cc: Jeff Moyer <jmoyer@redhat.com>
    Cc: Josh Poimboeuf <jpoimboe@redhat.com>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: Zhang Yi <yizhan@redhat.com>
    Cc: linux-nvdimm@lists.01.org
    Fixes: 917db484 ("x86/boot: Fix kdump, cleanup aborted E820_PRAM max_pfn manipulation")
    Link: http://lkml.kernel.org/r/147629530854.10618.10383744751594021268.stgit@dwillia2-desk3.amr.corp.intel.comSigned-off-by: default avatarIngo Molnar <mingo@kernel.org>
    23446cb6
e820.c 30.4 KB