Dan Williams c234231da4 x86/e820: Don't merge consecutive E820_PRAM ranges ...

commit 23446cb66c upstream.

Commit:

  917db484dc ("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: Dave Chinner <david@fromorbit.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
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: 917db484dc ("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.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2016-10-28 03:01:33 -04:00

..

alpha

alpha: fix copy_from_user()

2016-09-24 10:07:45 +02:00

arc

arc: don't leak bits of kernel stack into coredump

2016-10-28 03:01:32 -04:00

arm

ARM: dts: MSM8064 remove flags from SPMI/MPP IRQs

2016-10-16 17:36:15 +02:00

arm64

arm64: debug: avoid resetting stepping state machine when TIF_SINGLESTEP

2016-10-07 15:23:42 +02:00

avr32

avr32: off by one in at32_init_pio()

2016-10-07 15:23:45 +02:00

blackfin

net: smc91x: fix SMC accesses

2016-09-30 10:18:37 +02:00

c6x

…

cris

cris: buggered copy_from_user/copy_to_user/clear_user

2016-09-24 10:07:44 +02:00

frv

frv: fix clear_user()

2016-09-24 10:07:44 +02:00

h8300

…

hexagon

hexagon: fix strncpy_from_user() error return

2016-09-24 10:07:44 +02:00

ia64

ia64: copy_from_user() should zero the destination on access_ok() failure

2016-09-24 10:07:46 +02:00

m32r

m32r: fix __get_user()

2016-09-24 10:07:43 +02:00

m68k

…

metag

metag: Only define atomic_dec_if_positive conditionally

2016-10-28 03:01:31 -04:00

microblaze

microblaze: fix copy_from_user()

2016-09-24 10:07:43 +02:00

mips

MIPS: ptrace: Fix regs_return_value for kernel context

2016-10-28 03:01:30 -04:00

mn10300

mn10300: copy_from_user() should zero on access_ok() failure...

2016-09-24 10:07:45 +02:00

nios2

nios2: copy_from_user() should zero the tail of destination

2016-09-24 10:07:45 +02:00

openrisc

openrisc: fix the fix of copy_from_user()

2016-09-24 10:07:46 +02:00

parisc

parisc: Increase initial kernel mapping size

2016-10-28 03:01:27 -04:00

powerpc

powerpc/pseries: Fix stack corruption in htpe code

2016-10-28 03:01:28 -04:00

s390

s390: get_user() should zero on failure

2016-09-24 10:07:44 +02:00

score

score: fix copy_from_user() and friends

2016-09-24 10:07:44 +02:00

sh

sh: fix copy_from_user()

2016-09-24 10:07:44 +02:00

sparc

sparc32: fix copy_from_user()

2016-09-24 10:07:45 +02:00

tile

tile: Define AT_VECTOR_SIZE_ARCH for ARCH_DLINFO

2016-10-07 15:23:44 +02:00

um

um: Don't discard .text.exit section

2016-09-07 08:32:38 +02:00

unicore32

…

x86

x86/e820: Don't merge consecutive E820_PRAM ranges

2016-10-28 03:01:33 -04:00

xtensa

xtensa: clear all DBREAKC registers on start

2016-04-12 09:08:55 -07:00

.gitignore

…

Kconfig

…