Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d98ece1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-fixes-for-linus' of... 

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Fix hwpoison code related build failure on 32-bit NUMAQ
parents ba77d20f d949f36f

arch/x86/Kconfig

+11 −0
Original line number Original line Diff line number Diff line
@@ -432,6 +432,17 @@ config X86_NUMAQ 
	  of Flat Logical.  You will need a new lynxer.elf file to flash your

	  of Flat Logical.  You will need a new lynxer.elf file to flash your

	  firmware with - send email to <Martin.Bligh@us.ibm.com>.

	  firmware with - send email to <Martin.Bligh@us.ibm.com>.





config X86_SUPPORTS_MEMORY_FAILURE

	bool

	# MCE code calls memory_failure():

	depends on X86_MCE

	# On 32-bit this adds too big of NODES_SHIFT and we run out of page flags:

	depends on !X86_NUMAQ

	# On 32-bit SPARSEMEM adds too big of SECTIONS_WIDTH:

	depends on X86_64 || !SPARSEMEM

	select ARCH_SUPPORTS_MEMORY_FAILURE

	default y



config X86_VISWS

config X86_VISWS

	bool "SGI 320/540 (Visual Workstation)"

	bool "SGI 320/540 (Visual Workstation)"

	depends on X86_32 && PCI && X86_MPPARSE && PCI_GODIRECT

	depends on X86_32 && PCI && X86_MPPARSE && PCI_GODIRECT

mm/Kconfig

+3 −1
Original line number Original line Diff line number Diff line
@@ -244,10 +244,12 @@ config DEFAULT_MMAP_MIN_ADDR 
	  This value can be changed after boot using the

	  This value can be changed after boot using the

	  /proc/sys/vm/mmap_min_addr tunable.

	  /proc/sys/vm/mmap_min_addr tunable.





config ARCH_SUPPORTS_MEMORY_FAILURE

	bool





config MEMORY_FAILURE

config MEMORY_FAILURE

	depends on MMU

	depends on MMU

	depends on X86_MCE

	depends on ARCH_SUPPORTS_MEMORY_FAILURE

	bool "Enable recovery from hardware memory errors"

	bool "Enable recovery from hardware memory errors"

	help

	help

	  Enables code to recover from some memory failures on systems

	  Enables code to recover from some memory failures on systems