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

Commit ca02c216 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'please-pull-mce-bitmap-comment' of... 

Merge tag 'please-pull-mce-bitmap-comment' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras

 into x86/ras

Pull MCE updates from Tony Luck:

 "Better comments so we understand our existing machine check
  bank bitmaps - prelude to adding another bitmap soon."

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents d908e1eb 0644414e

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 10

SUBLEVEL = 0

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = Unicycling Gorilla



# *DOCUMENTATION*

arch/arm/Kconfig

+11 −1
Original line number Diff line number Diff line
@@ -1189,6 +1189,16 @@ config PL310_ERRATA_588369 
	   is not correctly implemented in PL310 as clean lines are not

	   invalidated as a result of these operations.



config ARM_ERRATA_643719

	bool "ARM errata: LoUIS bit field in CLIDR register is incorrect"

	depends on CPU_V7 && SMP

	help

	  This option enables the workaround for the 643719 Cortex-A9 (prior to

	  r1p0) erratum. On affected cores the LoUIS bit field of the CLIDR

	  register returns zero when it should return one. The workaround

	  corrects this value, ensuring cache maintenance operations which use

	  it behave as intended and avoiding data corruption.



config ARM_ERRATA_720789

	bool "ARM errata: TLBIASIDIS and TLBIMVAIS operations can broadcast a faulty ASID"

	depends on CPU_V7
@@ -2006,7 +2016,7 @@ config XIP_PHYS_ADDR 


config KEXEC

	bool "Kexec system call (EXPERIMENTAL)"

	depends on (!SMP || HOTPLUG_CPU)

	depends on (!SMP || PM_SLEEP_SMP)

	help

	  kexec is a system call that implements the ability to shutdown your

	  current kernel, and to start another kernel.  It is like a reboot

arch/arm/boot/compressed/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -116,7 +116,8 @@ targets := vmlinux vmlinux.lds \ 


# Make sure files are removed during clean

extra-y       += piggy.gzip piggy.lzo piggy.lzma piggy.xzkern \

		 lib1funcs.S ashldi3.S $(libfdt) $(libfdt_hdrs)

		 lib1funcs.S ashldi3.S $(libfdt) $(libfdt_hdrs) \

		 hyp-stub.S



ifeq ($(CONFIG_FUNCTION_TRACER),y)

ORIG_CFLAGS := $(KBUILD_CFLAGS)

arch/arm/boot/dts/exynos5250-pinctrl.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -763,7 +763,7 @@ 
		};

	};



	pinctrl@03680000 {

	pinctrl@03860000 {

		gpz: gpz {

			gpio-controller;

			#gpio-cells = <2>;

arch/arm/boot/dts/exynos5250.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -161,9 +161,9 @@ 
		interrupts = <0 50 0>;

	};



	pinctrl_3: pinctrl@03680000 {

	pinctrl_3: pinctrl@03860000 {

		compatible = "samsung,exynos5250-pinctrl";

		reg = <0x0368000 0x1000>;

		reg = <0x03860000 0x1000>;

		interrupts = <0 47 0>;

	};