# git rev-parse -q --verify 9e1909b9da04fb582b20d3805e16fad3f6ebf984^{commit} 9e1909b9da04fb582b20d3805e16fad3f6ebf984 already have revision, skipping fetch # git checkout -q -f -B kisskb 9e1909b9da04fb582b20d3805e16fad3f6ebf984 # git clean -qxdf # < git log -1 # commit 9e1909b9da04fb582b20d3805e16fad3f6ebf984 # Merge: df4fe17 bb8c13d # Author: Linus Torvalds # Date: Sun Mar 18 12:03:15 2018 -0700 # # Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip # # Pull x86/pti updates from Thomas Gleixner: # "Another set of melted spectrum updates: # # - Iron out the last late microcode loading issues by actually # checking whether new microcode is present and preventing the CPU # synchronization to run into a timeout induced hang. # # - Remove Skylake C2 from the microcode blacklist according to the # latest Intel documentation # # - Fix the VM86 POPF emulation which traps if VIP is set, but VIF is # not. Enhance the selftests to catch that kind of issue # # - Annotate indirect calls/jumps for objtool on 32bit. This is not a # functional issue, but for consistency sake its the right thing to # do. # # - Fix a jump label build warning observed on SPARC64 which uses 32bit # storage for the code location which is casted to 64 bit pointer w/o # extending it to 64bit first. # # - Add two new cpufeature bits. Not really an urgent issue, but # provides them for both x86 and x86/kvm work. No impact on the # current kernel" # # * 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: # x86/microcode: Fix CPU synchronization routine # x86/microcode: Attempt late loading only when new microcode is present # x86/speculation: Remove Skylake C2 from Speculation Control microcode blacklist # jump_label: Fix sparc64 warning # x86/speculation, objtool: Annotate indirect calls/jumps for objtool on 32-bit kernels # x86/vm86/32: Fix POPF emulation # selftests/x86/entry_from_vm86: Add test cases for POPF # selftests/x86/entry_from_vm86: Exit with 1 if we fail # x86/cpufeatures: Add Intel PCONFIG cpufeature # x86/cpufeatures: Add Intel Total Memory Encryption cpufeature # < /opt/cross/kisskb/br-sparc64-full-2016.08-613-ge98b4dd/bin/sparc64-linux-gcc --version # < git log --format=%s --max-count=1 9e1909b9da04fb582b20d3805e16fad3f6ebf984 # < make -s -j 48 ARCH=sparc64 O=/kisskb/build/linus_sparc64-allmodconfig_sparc64 CROSS_COMPILE=/opt/cross/kisskb/br-sparc64-full-2016.08-613-ge98b4dd/bin/sparc64-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_HAVE_FTRACE_MCOUNT_RECORD=n # Added to kconfig CONFIG_SAMPLES=n # Added to kconfig CONFIG_MODULE_SIG=n # yes \n | make -s -j 48 ARCH=sparc64 O=/kisskb/build/linus_sparc64-allmodconfig_sparc64 CROSS_COMPILE=/opt/cross/kisskb/br-sparc64-full-2016.08-613-ge98b4dd/bin/sparc64-linux- oldconfig yes: standard output: Broken pipe yes: write error # make -s -j 48 ARCH=sparc64 O=/kisskb/build/linus_sparc64-allmodconfig_sparc64 CROSS_COMPILE=/opt/cross/kisskb/br-sparc64-full-2016.08-613-ge98b4dd/bin/sparc64-linux- In file included from /kisskb/src/arch/sparc/include/asm/cmpxchg.h:5:0, from /kisskb/src/arch/sparc/include/asm/atomic_64.h:12, from /kisskb/src/arch/sparc/include/asm/atomic.h:5, from /kisskb/src/include/linux/atomic.h:5, from /kisskb/src/include/linux/rcupdate.h:38, from /kisskb/src/include/linux/rculist.h:11, from /kisskb/src/include/linux/pid.h:5, from /kisskb/src/include/linux/sched.h:14, from /kisskb/src/include/linux/pid_namespace.h:5, from /kisskb/src/kernel/debug/debug_core.c:33: /kisskb/src/kernel/debug/debug_core.c: In function 'kgdb_cpu_enter': /kisskb/src/arch/sparc/include/asm/cmpxchg_64.h:55:22: warning: value computed is not used [-Wunused-value] #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) ^ /kisskb/src/arch/sparc/include/asm/atomic_64.h:86:30: note: in expansion of macro 'xchg' #define atomic_xchg(v, new) (xchg(&((v)->counter), new)) ^ /kisskb/src/kernel/debug/debug_core.c:508:4: note: in expansion of macro 'atomic_xchg' atomic_xchg(&kgdb_active, cpu); ^ /kisskb/src/arch/sparc/include/asm/cmpxchg_64.h:55:22: warning: value computed is not used [-Wunused-value] #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) ^ /kisskb/src/arch/sparc/include/asm/atomic_64.h:86:30: note: in expansion of macro 'xchg' #define atomic_xchg(v, new) (xchg(&((v)->counter), new)) ^ /kisskb/src/kernel/debug/debug_core.c:523:5: note: in expansion of macro 'atomic_xchg' atomic_xchg(&kgdb_active, cpu); ^ /kisskb/src/drivers/input/joystick/analog.c:176:2: warning: #warning Precise timer not defined for this architecture. [-Wcpp] #warning Precise timer not defined for this architecture. ^ In file included from /kisskb/src/include/linux/swab.h:5:0, from /kisskb/src/include/uapi/linux/byteorder/big_endian.h:13, from /kisskb/src/include/linux/byteorder/big_endian.h:5, from /kisskb/src/arch/sparc/include/uapi/asm/byteorder.h:5, from /kisskb/src/arch/sparc/include/asm/bitops_64.h:16, from /kisskb/src/arch/sparc/include/asm/bitops.h:5, from /kisskb/src/include/linux/bitops.h:38, from /kisskb/src/include/linux/kernel.h:11, from /kisskb/src/include/linux/interrupt.h:6, from /kisskb/src/drivers/infiniband/hw/bnxt_re/qplib_fp.c:39: /kisskb/src/drivers/infiniband/hw/bnxt_re/qplib_fp.c: In function 'bnxt_qplib_create_srq': /kisskb/src/include/uapi/linux/byteorder/big_endian.h:31:52: warning: passing argument 1 of '__fswab64' makes integer from pointer without a cast [-Wint-conversion] #define __cpu_to_le64(x) ((__force __le64)__swab64((x))) ^ /kisskb/src/include/uapi/linux/swab.h:132:12: note: in definition of macro '__swab64' __fswab64(x)) ^ /kisskb/src/include/linux/byteorder/generic.h:86:21: note: in expansion of macro '__cpu_to_le64' #define cpu_to_le64 __cpu_to_le64 ^ /kisskb/src/drivers/infiniband/hw/bnxt_re/qplib_fp.c:529:19: note: in expansion of macro 'cpu_to_le64' req.srq_handle = cpu_to_le64(srq); ^ /kisskb/src/include/uapi/linux/swab.h:65:41: note: expected '__u64 {aka long long unsigned int}' but argument is of type 'struct bnxt_qplib_srq *' static inline __attribute_const__ __u64 __fswab64(__u64 val) ^ In file included from /kisskb/src/arch/sparc/include/asm/cmpxchg.h:5:0, from /kisskb/src/arch/sparc/include/asm/atomic_64.h:12, from /kisskb/src/arch/sparc/include/asm/atomic.h:5, from /kisskb/src/include/linux/atomic.h:5, from /kisskb/src/include/asm-generic/qspinlock_types.h:28, from /kisskb/src/arch/sparc/include/asm/spinlock_types.h:6, from /kisskb/src/include/linux/spinlock_types.h:13, from /kisskb/src/include/linux/spinlock.h:82, from /kisskb/src/include/linux/wait.h:9, from /kisskb/src/include/linux/wait_bit.h:8, from /kisskb/src/include/linux/fs.h:6, from /kisskb/src/fs/ocfs2/file.c:27: /kisskb/src/fs/ocfs2/file.c: In function 'ocfs2_file_write_iter': /kisskb/src/arch/sparc/include/asm/cmpxchg_64.h:55:22: warning: value computed is not used [-Wunused-value] #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) ^ /kisskb/src/fs/ocfs2/file.c:2386:3: note: in expansion of macro 'xchg' xchg(&iocb->ki_complete, saved_ki_complete); ^ In file included from /kisskb/src/arch/sparc/include/asm/cmpxchg.h:5:0, from /kisskb/src/arch/sparc/include/asm/atomic_64.h:12, from /kisskb/src/arch/sparc/include/asm/atomic.h:5, from /kisskb/src/include/linux/atomic.h:5, from /kisskb/src/include/asm-generic/qspinlock_types.h:28, from /kisskb/src/arch/sparc/include/asm/spinlock_types.h:6, from /kisskb/src/include/linux/spinlock_types.h:13, from /kisskb/src/include/linux/spinlock.h:82, from /kisskb/src/include/linux/seqlock.h:36, from /kisskb/src/include/linux/time.h:6, from /kisskb/src/include/linux/stat.h:19, from /kisskb/src/include/linux/module.h:10, from /kisskb/src/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c:30: /kisskb/src/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c: In function 'ixgbe_xdp_setup': /kisskb/src/arch/sparc/include/asm/cmpxchg_64.h:55:22: warning: value computed is not used [-Wunused-value] #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) ^ /kisskb/src/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c:9957:4: note: in expansion of macro 'xchg' xchg(&adapter->rx_ring[i]->xdp_prog, adapter->xdp_prog); ^ In file included from /kisskb/src/arch/sparc/include/asm/cmpxchg.h:5:0, from /kisskb/src/arch/sparc/include/asm/atomic_64.h:12, from /kisskb/src/arch/sparc/include/asm/atomic.h:5, from /kisskb/src/include/linux/atomic.h:5, from /kisskb/src/include/asm-generic/qspinlock_types.h:28, from /kisskb/src/arch/sparc/include/asm/spinlock_types.h:6, from /kisskb/src/include/linux/spinlock_types.h:13, from /kisskb/src/include/linux/spinlock.h:82, from /kisskb/src/include/linux/vmalloc.h:5, from /kisskb/src/drivers/net/wireless/st/cw1200/sta.c:12: /kisskb/src/drivers/net/wireless/st/cw1200/sta.c: In function 'cw1200_stop': /kisskb/src/arch/sparc/include/asm/cmpxchg_64.h:55:22: warning: value computed is not used [-Wunused-value] #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) ^ /kisskb/src/arch/sparc/include/asm/atomic_64.h:86:30: note: in expansion of macro 'xchg' #define atomic_xchg(v, new) (xchg(&((v)->counter), new)) ^ /kisskb/src/drivers/net/wireless/st/cw1200/sta.c:143:2: note: in expansion of macro 'atomic_xchg' atomic_xchg(&priv->tx_lock, 0); /* for recovery to work */ ^ In file included from /kisskb/src/arch/sparc/include/asm/cmpxchg.h:5:0, from /kisskb/src/arch/sparc/include/asm/atomic_64.h:12, from /kisskb/src/arch/sparc/include/asm/atomic.h:5, from /kisskb/src/include/linux/atomic.h:5, from /kisskb/src/include/linux/rcupdate.h:38, from /kisskb/src/include/linux/rculist.h:11, from /kisskb/src/include/linux/pid.h:5, from /kisskb/src/include/linux/sched.h:14, from /kisskb/src/drivers/net/wireless/st/cw1200/scan.c:12: /kisskb/src/drivers/net/wireless/st/cw1200/scan.c: In function 'cw1200_clear_recent_scan_work': /kisskb/src/arch/sparc/include/asm/cmpxchg_64.h:55:22: warning: value computed is not used [-Wunused-value] #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) ^ /kisskb/src/arch/sparc/include/asm/atomic_64.h:86:30: note: in expansion of macro 'xchg' #define atomic_xchg(v, new) (xchg(&((v)->counter), new)) ^ /kisskb/src/drivers/net/wireless/st/cw1200/scan.c:336:2: note: in expansion of macro 'atomic_xchg' atomic_xchg(&priv->recent_scan, 0); ^ In file included from /kisskb/src/arch/sparc/include/asm/cmpxchg.h:5:0, from /kisskb/src/arch/sparc/include/asm/atomic_64.h:12, from /kisskb/src/arch/sparc/include/asm/atomic.h:5, from /kisskb/src/include/linux/atomic.h:5, from /kisskb/src/include/asm-generic/qspinlock_types.h:28, from /kisskb/src/arch/sparc/include/asm/spinlock_types.h:6, from /kisskb/src/include/linux/spinlock_types.h:13, from /kisskb/src/include/linux/spinlock.h:82, from /kisskb/src/include/linux/seqlock.h:36, from /kisskb/src/include/linux/time.h:6, from /kisskb/src/include/linux/stat.h:19, from /kisskb/src/include/linux/module.h:10, from /kisskb/src/drivers/scsi/scsi_debug.c:23: /kisskb/src/drivers/scsi/scsi_debug.c: In function 'resp_start_stop': /kisskb/src/arch/sparc/include/asm/cmpxchg_64.h:55:22: warning: value computed is not used [-Wunused-value] #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) ^ /kisskb/src/arch/sparc/include/asm/atomic_64.h:86:30: note: in expansion of macro 'xchg' #define atomic_xchg(v, new) (xchg(&((v)->counter), new)) ^ /kisskb/src/drivers/scsi/scsi_debug.c:1599:2: note: in expansion of macro 'atomic_xchg' atomic_xchg(&devip->stopped, stop); ^ kernel: arch/sparc/boot/image is ready kernel: arch/sparc/boot/zImage is ready Completed OK # rm -rf /kisskb/build/linus_sparc64-allmodconfig_sparc64 # Build took: 0:10:34.675282