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

Commit d41ad6df authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (34 commits)
  powerpc/mpic: Fix mask/unmask timeout message
  powerpc/pseries: Add BNX2=m to defconfig
  powerpc: Enable 64kB pages and 1024 threads in pseries config
  powerpc: Disable mcount tracers in pseries defconfig
  powerpc/boot/dts: Install dts from the right directory
  powerpc: machine_check_generic is wrong on 64bit
  powerpc: Check RTAS extended log flag before checking length
  powerpc: Fix corruption when grabbing FWNMI data
  powerpc: Rework pseries machine check handler
  powerpc: Don't silently handle machine checks from userspace
  powerpc: Remove duplicate debugger hook in machine_check_exception
  powerpc: Never halt RTAS error logging after receiving an unrecoverable machine check
  powerpc: Don't force MSR_RI in machine_check_exception
  powerpc: Print 32 bits of DSISR in show_regs
  powerpc/kdump: Disable ftrace during kexec
  powerpc/kdump: Move crash_kexec_stop_spus to kdump crash handler
  powerpc/kexec: Remove empty ppc_md.machine_kexec_prepare
  powerpc/kexec: Don't initialise kexec hooks to default handlers
  powerpc/kdump: Remove ppc_md.machine_crash_shutdown
  powerpc/kexec: Remove ppc_md.machine_kexec
  ...
parents 3dece370 8bfc5e36

arch/powerpc/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ INSTALL := install 
extra-installed		:= $(patsubst $(obj)/%, $(DESTDIR)$(WRAPPER_OBJDIR)/%, $(extra-y))

hostprogs-installed	:= $(patsubst %, $(DESTDIR)$(WRAPPER_BINDIR)/%, $(hostprogs-y))

wrapper-installed	:= $(DESTDIR)$(WRAPPER_BINDIR)/wrapper

dts-installed		:= $(patsubst $(obj)/dts/%, $(DESTDIR)$(WRAPPER_DTSDIR)/%, $(wildcard $(obj)/dts/*.dts))

dts-installed		:= $(patsubst $(dtstree)/%, $(DESTDIR)$(WRAPPER_DTSDIR)/%, $(wildcard $(dtstree)/*.dts))



all-installed		:= $(extra-installed) $(hostprogs-installed) $(wrapper-installed) $(dts-installed)

arch/powerpc/boot/dts/mpc8308rdb.dts

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ 
		#address-cells = <1>;

		#size-cells = <1>;

		device_type = "soc";

		compatible = "fsl,mpc8315-immr", "simple-bus";

		compatible = "fsl,mpc8308-immr", "simple-bus";

		ranges = <0 0xe0000000 0x00100000>;

		reg = <0xe0000000 0x00000200>;

		bus-frequency = <0>;

arch/powerpc/boot/dts/p1022ds.dts

+2 −2
Original line number Diff line number Diff line
@@ -291,13 +291,13 @@ 
			ranges = <0x0 0xc100 0x200>;

			cell-index = <1>;

			dma00: dma-channel@0 {

				compatible = "fsl,eloplus-dma-channel";

				compatible = "fsl,ssi-dma-channel";

				reg = <0x0 0x80>;

				cell-index = <0>;

				interrupts = <76 2>;

			};

			dma01: dma-channel@80 {

				compatible = "fsl,eloplus-dma-channel";

				compatible = "fsl,ssi-dma-channel";

				reg = <0x80 0x80>;

				cell-index = <1>;

				interrupts = <77 2>;

arch/powerpc/configs/pseries_defconfig

+4 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ CONFIG_PPC64=y 
CONFIG_ALTIVEC=y

CONFIG_VSX=y

CONFIG_SMP=y

CONFIG_NR_CPUS=128

CONFIG_NR_CPUS=1024

CONFIG_EXPERIMENTAL=y

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y
@@ -45,6 +45,8 @@ CONFIG_KEXEC=y 
CONFIG_IRQ_ALL_CPUS=y

CONFIG_MEMORY_HOTPLUG=y

CONFIG_MEMORY_HOTREMOVE=y

CONFIG_PPC_64K_PAGES=y

CONFIG_PPC_SUBPAGE_PROT=y

CONFIG_SCHED_SMT=y

CONFIG_HOTPLUG_PCI=m

CONFIG_HOTPLUG_PCI_RPA=m
@@ -184,6 +186,7 @@ CONFIG_ACENIC_OMIT_TIGON_I=y 
CONFIG_E1000=y

CONFIG_E1000E=y

CONFIG_TIGON3=y

CONFIG_BNX2=m

CONFIG_CHELSIO_T1=m

CONFIG_CHELSIO_T3=m

CONFIG_EHEA=y
@@ -311,9 +314,7 @@ CONFIG_DEBUG_KERNEL=y 
# CONFIG_RCU_CPU_STALL_DETECTOR is not set

CONFIG_LATENCYTOP=y

CONFIG_SYSCTL_SYSCALL_CHECK=y

CONFIG_IRQSOFF_TRACER=y

CONFIG_SCHED_TRACER=y

CONFIG_STACK_TRACER=y

CONFIG_BLK_DEV_IO_TRACE=y

CONFIG_DEBUG_STACKOVERFLOW=y

CONFIG_DEBUG_STACK_USAGE=y

arch/powerpc/include/asm/feature-fixups.h

+15 −12
Original line number Diff line number Diff line
@@ -49,6 +49,9 @@ label##5: \ 
	FTR_ENTRY_OFFSET label##2b-label##5b;			\

	FTR_ENTRY_OFFSET label##3b-label##5b;			\

	FTR_ENTRY_OFFSET label##4b-label##5b;			\

	.ifgt (label##4b-label##3b)-(label##2b-label##1b);	\

	.error "Feature section else case larger than body";	\

	.endif;							\

	.popsection;