# git rev-parse -q --verify 25d8d4eecace9de5a6a2193e4df1917afbdd3052^{commit} 25d8d4eecace9de5a6a2193e4df1917afbdd3052 already have revision, skipping fetch # git checkout -q -f -B kisskb 25d8d4eecace9de5a6a2193e4df1917afbdd3052 # git clean -qxdf # < git log -1 # commit 25d8d4eecace9de5a6a2193e4df1917afbdd3052 # Merge: 60e76bb8a4e4 a7aaa2f26bfd # Author: Linus Torvalds # Date: Fri Aug 7 10:33:50 2020 -0700 # # Merge tag 'powerpc-5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux # # Pull powerpc updates from Michael Ellerman: # # - Add support for (optionally) using queued spinlocks & rwlocks. # # - Support for a new faster system call ABI using the scv instruction on # Power9 or later. # # - Drop support for the PROT_SAO mmap/mprotect flag as it will be # unsupported on Power10 and future processors, leaving us with no way # to implement the functionality it requests. This risks breaking # userspace, though we believe it is unused in practice. # # - A bug fix for, and then the removal of, our custom stack expansion # checking. We now allow stack expansion up to the rlimit, like other # architectures. # # - Remove the remnants of our (previously disabled) topology update # code, which tried to react to NUMA layout changes on virtualised # systems, but was prone to crashes and other problems. # # - Add PMU support for Power10 CPUs. # # - A change to our signal trampoline so that we don't unbalance the link # stack (branch return predictor) in the signal delivery path. # # - Lots of other cleanups, refactorings, smaller features and so on as # usual. # # Thanks to: Abhishek Goel, Alastair D'Silva, Alexander A. Klimov, Alexey # Kardashevskiy, Alistair Popple, Andrew Donnellan, Aneesh Kumar K.V, Anju # T Sudhakar, Anton Blanchard, Arnd Bergmann, Athira Rajeev, Balamuruhan # S, Bharata B Rao, Bill Wendling, Bin Meng, Cédric Le Goater, Chris # Packham, Christophe Leroy, Christoph Hellwig, Daniel Axtens, Dan # Williams, David Lamparter, Desnes A. Nunes do Rosario, Erhard F., Finn # Thain, Frederic Barrat, Ganesh Goudar, Gautham R. Shenoy, Geoff Levand, # Greg Kurz, Gustavo A. R. Silva, Hari Bathini, Harish, Imre Kaloz, Joel # Stanley, Joe Perches, John Crispin, Jordan Niethe, Kajol Jain, Kamalesh # Babulal, Kees Cook, Laurent Dufour, Leonardo Bras, Li RongQing, Madhavan # Srinivasan, Mahesh Salgaonkar, Mark Cave-Ayland, Michal Suchanek, Milton # Miller, Mimi Zohar, Murilo Opsfelder Araujo, Nathan Chancellor, Nathan # Lynch, Naveen N. Rao, Nayna Jain, Nicholas Piggin, Oliver O'Halloran, # Palmer Dabbelt, Pedro Miraglia Franco de Carvalho, Philippe Bergheaud, # Pingfan Liu, Pratik Rajesh Sampat, Qian Cai, Qinglang Miao, Randy # Dunlap, Ravi Bangoria, Sachin Sant, Sam Bobroff, Sandipan Das, Santosh # Sivaraj, Satheesh Rajendran, Shirisha Ganta, Sourabh Jain, Srikar # Dronamraju, Stan Johnson, Stephen Rothwell, Thadeu Lima de Souza # Cascardo, Thiago Jung Bauermann, Tom Lane, Vaibhav Jain, Vladis Dronov, # Wei Yongjun, Wen Xiong, YueHaibing. # # * tag 'powerpc-5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (337 commits) # selftests/powerpc: Fix pkey syscall redefinitions # powerpc: Fix circular dependency between percpu.h and mmu.h # powerpc/powernv/sriov: Fix use of uninitialised variable # selftests/powerpc: Skip vmx/vsx/tar/etc tests on older CPUs # powerpc/40x: Fix assembler warning about r0 # powerpc/papr_scm: Add support for fetching nvdimm 'fuel-gauge' metric # powerpc/papr_scm: Fetch nvdimm performance stats from PHYP # cpuidle: pseries: Fixup exit latency for CEDE(0) # cpuidle: pseries: Add function to parse extended CEDE records # cpuidle: pseries: Set the latency-hint before entering CEDE # selftests/powerpc: Fix online CPU selection # powerpc/perf: Consolidate perf_callchain_user_[64|32]() # powerpc/pseries/hotplug-cpu: Remove double free in error path # powerpc/pseries/mobility: Add pr_debug() for device tree changes # powerpc/pseries/mobility: Set pr_fmt() # powerpc/cacheinfo: Warn if cache object chain becomes unordered # powerpc/cacheinfo: Improve diagnostics about malformed cache lists # powerpc/cacheinfo: Use name@unit instead of full DT path in debug messages # powerpc/cacheinfo: Set pr_fmt() # powerpc: fix function annotations to avoid section mismatch warnings with gcc-10 # ... # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/mips-linux/bin/mips-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/mips-linux/bin/mips-linux-ld --version # < git log --format=%s --max-count=1 25d8d4eecace9de5a6a2193e4df1917afbdd3052 # < make -s -j 48 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/mips-linux/bin/mips-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # Added to kconfig CONFIG_MIPS_CPS_NS16550_BASE=0x1b0003f8 # Added to kconfig CONFIG_MIPS_CPS_NS16550_SHIFT=0 # < make -s -j 48 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/mips-linux/bin/mips-linux- help # make -s -j 48 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/mips-linux/bin/mips-linux- olddefconfig .config:12419:warning: override: reassigning to symbol MIPS_CPS_NS16550_SHIFT # make -s -j 48 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/mips-linux/bin/mips-linux- In file included from /kisskb/src/include/linux/time.h:6:0, from /kisskb/src/include/linux/compat.h:10, from /kisskb/src/arch/mips/kernel/asm-offsets.c:12: /kisskb/src/include/linux/seqlock.h: In function 'write_seqcount_begin_nested': /kisskb/src/include/linux/seqlock.h:285:2: error: implicit declaration of function 'raw_smp_processor_id' [-Werror=implicit-function-declaration] lockdep_assert_preemption_disabled(); ^ In file included from /kisskb/src/include/linux/smp.h:82:0, from /kisskb/src/arch/mips/include/asm/cpu-type.h:12, from /kisskb/src/arch/mips/include/asm/timex.h:19, from /kisskb/src/include/linux/timex.h:65, from /kisskb/src/include/linux/time32.h:13, from /kisskb/src/include/linux/time.h:74, from /kisskb/src/include/linux/compat.h:10, from /kisskb/src/arch/mips/kernel/asm-offsets.c:12: /kisskb/src/arch/mips/include/asm/smp.h: At top level: /kisskb/src/arch/mips/include/asm/smp.h:28:19: error: static declaration of 'raw_smp_processor_id' follows non-static declaration static inline int raw_smp_processor_id(void) ^ In file included from /kisskb/src/arch/mips/include/asm/bug.h:42:0, from /kisskb/src/include/linux/bug.h:5, from /kisskb/src/include/linux/thread_info.h:12, from /kisskb/src/include/asm-generic/preempt.h:5, from ./arch/mips/include/generated/asm/preempt.h:1, from /kisskb/src/include/linux/preempt.h:78, from /kisskb/src/include/linux/spinlock.h:51, from /kisskb/src/include/linux/seqlock.h:15, from /kisskb/src/include/linux/time.h:6, from /kisskb/src/include/linux/compat.h:10, from /kisskb/src/arch/mips/kernel/asm-offsets.c:12: /kisskb/src/include/asm-generic/percpu.h:31:40: note: previous implicit declaration of 'raw_smp_processor_id' was here #define __my_cpu_offset per_cpu_offset(raw_smp_processor_id()) ^ /kisskb/src/include/asm-generic/bug.h:145:27: note: in definition of macro 'WARN_ON_ONCE' int __ret_warn_once = !!(condition); \ ^ /kisskb/src/include/linux/compiler_types.h:301:2: note: in expansion of macro '__compiletime_assert' __compiletime_assert(condition, msg, prefix, suffix) ^ /kisskb/src/include/linux/compiler_types.h:313:2: note: in expansion of macro '_compiletime_assert' _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) ^ /kisskb/src/include/asm-generic/rwonce.h:36:2: note: in expansion of macro 'compiletime_assert' compiletime_assert(__native_word(t) || sizeof(t) == sizeof(long long), \ ^ /kisskb/src/include/asm-generic/rwonce.h:36:21: note: in expansion of macro '__native_word' compiletime_assert(__native_word(t) || sizeof(t) == sizeof(long long), \ ^ /kisskb/src/include/asm-generic/rwonce.h:49:2: note: in expansion of macro 'compiletime_assert_rwonce_type' compiletime_assert_rwonce_type(x); \ ^ /kisskb/src/include/asm-generic/percpu.h:119:10: note: in expansion of macro 'READ_ONCE' __ret = READ_ONCE(*raw_cpu_ptr(&(pcp))); \ ^ /kisskb/src/include/linux/percpu-defs.h:231:2: note: in expansion of macro 'RELOC_HIDE' RELOC_HIDE((typeof(*(__p)) __kernel __force *)(__p), (__offset)) ^ /kisskb/src/include/asm-generic/percpu.h:44:31: note: in expansion of macro 'SHIFT_PERCPU_PTR' #define arch_raw_cpu_ptr(ptr) SHIFT_PERCPU_PTR(ptr, __my_cpu_offset) ^ /kisskb/src/include/asm-generic/percpu.h:31:25: note: in expansion of macro 'per_cpu_offset' #define __my_cpu_offset per_cpu_offset(raw_smp_processor_id()) ^ /kisskb/src/include/asm-generic/percpu.h:44:53: note: in expansion of macro '__my_cpu_offset' #define arch_raw_cpu_ptr(ptr) SHIFT_PERCPU_PTR(ptr, __my_cpu_offset) ^ /kisskb/src/include/linux/percpu-defs.h:242:2: note: in expansion of macro 'arch_raw_cpu_ptr' arch_raw_cpu_ptr(ptr); \ ^ /kisskb/src/include/asm-generic/percpu.h:119:21: note: in expansion of macro 'raw_cpu_ptr' __ret = READ_ONCE(*raw_cpu_ptr(&(pcp))); \ ^ /kisskb/src/include/asm-generic/percpu.h:138:11: note: in expansion of macro '__this_cpu_generic_read_nopreempt' __ret = __this_cpu_generic_read_nopreempt(pcp); \ ^ /kisskb/src/include/asm-generic/percpu.h:320:31: note: in expansion of macro 'this_cpu_generic_read' #define this_cpu_read_1(pcp) this_cpu_generic_read(pcp) ^ /kisskb/src/include/linux/percpu-defs.h:321:23: note: in expansion of macro 'this_cpu_read_1' case 1: pscr_ret__ = stem##1(variable); break; \ ^ /kisskb/src/include/linux/percpu-defs.h:507:29: note: in expansion of macro '__pcpu_size_call_return' #define this_cpu_read(pcp) __pcpu_size_call_return(this_cpu_read_, pcp) ^ /kisskb/src/include/linux/lockdep.h:565:9: note: in expansion of macro 'this_cpu_read' this_cpu_read(hardirqs_enabled))); \ ^ /kisskb/src/include/linux/seqlock.h:285:2: note: in expansion of macro 'lockdep_assert_preemption_disabled' lockdep_assert_preemption_disabled(); ^ cc1: some warnings being treated as errors make[2]: *** [/kisskb/src/scripts/Makefile.build:114: arch/mips/kernel/asm-offsets.s] Error 1 make[1]: *** [/kisskb/src/Makefile:1195: prepare0] Error 2 make: *** [Makefile:185: __sub-make] Error 2 Command 'make -s -j 48 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/mips-linux/bin/mips-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_mips-allmodconfig_mips-gcc4.9 # Build took: 0:00:21.605224