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

Merge tag 'powerpc-5.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull more powerpc updates from Michael Ellerman:
 "The bulk of this is the series to make CONFIG_COMPAT user-selectable,
  it's been around for a long time but was blocked behind the
  syscall-in-C series.

  Plus there's also a few fixes and other minor things.

  Summary:

   - A fix for a crash in machine check handling on pseries (ie. guests)

   - A small series to make it possible to disable CONFIG_COMPAT, and
     turn it off by default for ppc64le where it's not used.

   - A few other miscellaneous fixes and small improvements.

  Thanks to: Alexey Kardashevskiy, Anju T Sudhakar, Arnd Bergmann,
  Christophe Leroy, Dan Carpenter, Ganesh Goudar, Geert Uytterhoeven,
  Geoff Levand, Mahesh Salgaonkar, Markus Elfring, Michal Suchanek,
  Nicholas Piggin, Stephen Boyd, Wen Xiong"

* tag 'powerpc-5.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  selftests/powerpc: Always build the tm-poison test 64-bit
  powerpc: Improve ppc_save_regs()
  Revert "powerpc/64: irq_work avoid interrupt when called with hardware irqs enabled"
  powerpc/time: Replace <linux/clk-provider.h> by <linux/of_clk.h>
  powerpc/pseries/ddw: Extend upper limit for huge DMA window for persistent memory
  powerpc/perf: split callchain.c by bitness
  powerpc/64: Make COMPAT user-selectable disabled on littleendian by default.
  powerpc/64: make buildable without CONFIG_COMPAT
  powerpc/perf: consolidate valid_user_sp -> invalid_user_sp
  powerpc/perf: consolidate read_user_stack_32
  powerpc: move common register copy functions from signal_32.c to signal.c
  powerpc: Add back __ARCH_WANT_SYS_LLSEEK macro
  powerpc/ps3: Set CONFIG_UEVENT_HELPER=y in ps3_defconfig
  powerpc/ps3: Remove an unneeded NULL check
  powerpc/ps3: Remove duplicate error message
  powerpc/powernv: Re-enable imc trace-mode in kernel
  powerpc/perf: Implement a global lock to avoid races between trace, core and thread imc events.
  powerpc/pseries: Fix MCE handling on pseries
  selftests/eeh: Skip ahci adapters
  powerpc/64s: Fix doorbell wakeup msgclr optimisation
parents 6cff4821 6ba4a2d3

arch/powerpc/Kconfig

+3 −2
Original line number Diff line number Diff line
@@ -266,8 +266,9 @@ config PANIC_TIMEOUT 
	default 180



config COMPAT

	bool

	default y if PPC64

	bool "Enable support for 32bit binaries"

	depends on PPC64

	default y if !CPU_LITTLE_ENDIAN

	select COMPAT_BINFMT_ELF

	select ARCH_WANT_OLD_COMPAT_IPC

	select COMPAT_OLD_SIGACTION

arch/powerpc/configs/ps3_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ CONFIG_CFG80211=m 
CONFIG_CFG80211_WEXT=y

CONFIG_MAC80211=m

# CONFIG_MAC80211_RC_MINSTREL is not set

CONFIG_UEVENT_HELPER=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=65535

arch/powerpc/include/asm/thread_info.h

+2 −2
Original line number Diff line number Diff line
@@ -162,10 +162,10 @@ static inline bool test_thread_local_flags(unsigned int flags) 
	return (ti->local_flags & flags) != 0;

}



#ifdef CONFIG_PPC64

#ifdef CONFIG_COMPAT

#define is_32bit_task()	(test_thread_flag(TIF_32BIT))

#else

#define is_32bit_task()	(1)

#define is_32bit_task()	(IS_ENABLED(CONFIG_PPC32))

#endif



#if defined(CONFIG_PPC64)

arch/powerpc/include/asm/unistd.h

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#define __ARCH_WANT_SYS_SOCKETCALL

#define __ARCH_WANT_SYS_FADVISE64

#define __ARCH_WANT_SYS_GETPGRP

#define __ARCH_WANT_SYS_LLSEEK

#define __ARCH_WANT_SYS_NICE

#define __ARCH_WANT_SYS_OLD_GETRLIMIT

#define __ARCH_WANT_SYS_OLD_UNAME

arch/powerpc/kernel/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -40,16 +40,17 @@ CFLAGS_btext.o += -DDISABLE_BRANCH_PROFILING 
endif



obj-y				:= cputable.o syscalls.o \

				   irq.o align.o signal_32.o pmc.o vdso.o \

				   irq.o align.o signal_$(BITS).o pmc.o vdso.o \

				   process.o systbl.o idle.o \

				   signal.o sysfs.o cacheinfo.o time.o \

				   prom.o traps.o setup-common.o \

				   udbg.o misc.o io.o misc_$(BITS).o \

				   of_platform.o prom_parse.o

obj-y				+= ptrace/

obj-$(CONFIG_PPC64)		+= setup_64.o sys_ppc32.o signal_64.o \

obj-$(CONFIG_PPC64)		+= setup_64.o \

				   paca.o nvram_64.o firmware.o note.o \

				   syscall_64.o

obj-$(CONFIG_COMPAT)		+= sys_ppc32.o signal_32.o

obj-$(CONFIG_VDSO32)		+= vdso32/

obj-$(CONFIG_PPC_WATCHDOG)	+= watchdog.o

obj-$(CONFIG_HAVE_HW_BREAKPOINT)	+= hw_breakpoint.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE