Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc (b9e22290) · Commits · 戴 / test

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] Remove unused CONFIG_WANT_DEVICE_TREE [POWERPC] Cell RAS: Remove DEBUG, and add license and copyright [POWERPC] hvc_rtas_init() must be __init [POWERPC] free_property() must not be __init [POWERPC] vdso_do_func_patch{32,64}() must be __init [POWERPC] Remove generated files on make clean [POWERPC] Fix arch/ppc compilation - add typedef for pgtable_t [POWERPC] Wire up new timerfd syscalls [POWERPC] PS3: Update sys-manager button events [POWERPC] PS3: Sys-manager code cleanup [POWERPC] PS3: Use system reboot on restart [POWERPC] PS3: Fix bootwrapper hang bug [POWERPC] PS3: Fix reading pm interval in logical performance monitor [POWERPC] PS3: Fix setting bookmark in logical performance monitor [POWERPC] Fix DEBUG_PREEMPT warning when warning

arch/powerpc/Kconfig

+0 −4

Original line number	Diff line number	Diff line
		@@ -442,10 +442,6 @@ config SECCOMP

		If unsure, say Y. Only embedded should say N here.

		config WANT_DEVICE_TREE
		bool
		default n

		endmenu

		config ISA_DMA_API

arch/powerpc/boot/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -147,6 +147,8 @@ HOSTCFLAGS += -I$(src)/dtc-src/ -I$(src)/libfdt/
		targets += dtc-src/dtc-parser.tab.c
		targets += dtc-src/dtc-lexer.lex.c

		clean-files += dtc-src/dtc-parser.tab.h

		ifdef DTC_GENPARSER
		BISON = bison
		FLEX = flex

arch/powerpc/boot/ps3-hvcall.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -145,7 +145,7 @@
		.macro STORE_REGS_5_2
		lwz r11, 16(r1)
		std r4, 0(r11)
		lwz r11, 24(r1)
		lwz r11, 20(r1)
		std r5, 0(r11)
		.endm

arch/powerpc/kernel/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -104,3 +104,5 @@ quiet_cmd_systbl_chk = CALL $<
		PHONY += systbl_chk
		systbl_chk: $(src)/systbl_chk.sh $(obj)/systbl_chk.i
		$(call cmd,systbl_chk)

		clean-files := vmlinux.lds

arch/powerpc/kernel/process.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -462,7 +462,7 @@ void show_regs(struct pt_regs * regs)
		current, task_pid_nr(current), current->comm, task_thread_info(current));

		#ifdef CONFIG_SMP
		printk(" CPU: %d", smp_processor_id());
		printk(" CPU: %d", raw_smp_processor_id());
		#endif /* CONFIG_SMP */

		for (i = 0; i < 32; i++) {

Admin message