# git rev-parse -q --verify 4b78317679c4f3782a3cff0ddb269c1fcfde7621^{commit} 4b78317679c4f3782a3cff0ddb269c1fcfde7621 already have revision, skipping fetch # git checkout -q -f -B kisskb 4b78317679c4f3782a3cff0ddb269c1fcfde7621 # git clean -qxdf # < git log -1 # commit 4b78317679c4f3782a3cff0ddb269c1fcfde7621 # Merge: 880584176ed7 55a974021ec9 # Author: Linus Torvalds # Date: Sat Dec 1 12:35:48 2018 -0800 # # Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip # # Pull STIBP fallout fixes from Thomas Gleixner: # "The performance destruction department finally got it's act together # and came up with a cure for the STIPB regression: # # - Provide a command line option to control the spectre v2 user space # mitigations. Default is either seccomp or prctl (if seccomp is # disabled in Kconfig). prctl allows mitigation opt-in, seccomp # enables the migitation for sandboxed processes. # # - Rework the code to handle the conditional STIBP/IBPB control and # remove the now unused ptrace_may_access_sched() optimization # attempt # # - Disable STIBP automatically when SMT is disabled # # - Optimize the switch_to() logic to avoid MSR writes and invocations # of __switch_to_xtra(). # # - Make the asynchronous speculation TIF updates synchronous to # prevent stale mitigation state. # # As a general cleanup this also makes retpoline directly depend on # compiler support and removes the 'minimal retpoline' option which just # pretended to provide some form of security while providing none" # # * 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (31 commits) # x86/speculation: Provide IBPB always command line options # x86/speculation: Add seccomp Spectre v2 user space protection mode # x86/speculation: Enable prctl mode for spectre_v2_user # x86/speculation: Add prctl() control for indirect branch speculation # x86/speculation: Prepare arch_smt_update() for PRCTL mode # x86/speculation: Prevent stale SPEC_CTRL msr content # x86/speculation: Split out TIF update # ptrace: Remove unused ptrace_may_access_sched() and MODE_IBRS # x86/speculation: Prepare for conditional IBPB in switch_mm() # x86/speculation: Avoid __switch_to_xtra() calls # x86/process: Consolidate and simplify switch_to_xtra() code # x86/speculation: Prepare for per task indirect branch speculation control # x86/speculation: Add command line control for indirect branch speculation # x86/speculation: Unify conditional spectre v2 print functions # x86/speculataion: Mark command line parser data __initdata # x86/speculation: Mark string arrays const correctly # x86/speculation: Reorder the spec_v2 code # x86/l1tf: Show actual SMT state # x86/speculation: Rework SMT state change # sched/smt: Expose sched_smt_present static key # ... # < /opt/cross/kisskb/gcc-4.6.3-nolibc/sh4-linux/bin/sh4-linux-gcc --version # < git log --format=%s --max-count=1 4b78317679c4f3782a3cff0ddb269c1fcfde7621 # < make -s -j 120 ARCH=sh O=/kisskb/build/linus_urquell_defconfig_sh4 CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/sh4-linux/bin/sh4-linux- urquell_defconfig # make -s -j 120 ARCH=sh O=/kisskb/build/linus_urquell_defconfig_sh4 CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/sh4-linux/bin/sh4-linux- Generating include/generated/machtypes.h :1317:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp] :1320:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp] :1323:2: warning: #warning syscall pkey_free not implemented [-Wcpp] :1326:2: warning: #warning syscall statx not implemented [-Wcpp] :1332:2: warning: #warning syscall io_pgetevents not implemented [-Wcpp] :1335:2: warning: #warning syscall rseq not implemented [-Wcpp] /kisskb/src/arch/sh/kernel/cpu/sh4/../sh3/../../entry-common.S: Assembler messages: /kisskb/src/arch/sh/kernel/cpu/sh4/../sh3/../../entry-common.S:389: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence /kisskb/src/arch/sh/kernel/cpu/sh4/../sh3/../../entry-common.S:392: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence /kisskb/src/arch/sh/kernel/cpu/sh4a/setup-sh7786.c:245:31: warning: 'tmu3_device' defined but not used [-Wunused-variable] /kisskb/src/kernel/cgroup/cgroup-v1.c: In function 'cgroup1_mount': /kisskb/src/kernel/cgroup/cgroup-v1.c:1256:20: warning: 'root' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/kernel/printk/printk.c: In function 'devkmsg_sysctl_set_loglvl': /kisskb/src/kernel/printk/printk.c:186:16: warning: 'old' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/mm/hugetlb.c: In function 'alloc_pool_huge_page': /kisskb/src/mm/hugetlb.c:1433:5: warning: 'page' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/base/regmap/regmap.c: In function 'regmap_raw_read': /kisskb/src/drivers/base/regmap/regmap.c:2594:6: warning: 'ret' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/i2c/i2c-core-base.c: In function 'i2c_generic_scl_recovery': /kisskb/src/drivers/i2c/i2c-core-base.c:235:5: warning: 'ret' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/base/regmap/regmap.c: In function '_regmap_raw_write': /kisskb/src/drivers/base/regmap/regmap.c:1855:6: warning: 'ret' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/sh/clk/cpg.c: In function 'r8': /kisskb/src/drivers/sh/clk/cpg.c:41:2: warning: passing argument 1 of 'ioread8' discards 'const' qualifier from pointer target type [enabled by default] /kisskb/src/include/asm-generic/iomap.h:29:21: note: expected 'void *' but argument is of type 'const void *' /kisskb/src/drivers/sh/clk/cpg.c: In function 'r16': /kisskb/src/drivers/sh/clk/cpg.c:46:2: warning: passing argument 1 of 'ioread16' discards 'const' qualifier from pointer target type [enabled by default] /kisskb/src/include/asm-generic/iomap.h:30:21: note: expected 'void *' but argument is of type 'const void *' /kisskb/src/drivers/sh/clk/cpg.c: In function 'r32': /kisskb/src/drivers/sh/clk/cpg.c:51:2: warning: passing argument 1 of 'ioread32' discards 'const' qualifier from pointer target type [enabled by default] /kisskb/src/include/asm-generic/iomap.h:32:21: note: expected 'void *' but argument is of type 'const void *' /kisskb/src/fs/proc/inode.c: In function 'proc_reg_open': /kisskb/src/include/linux/list.h:65:12: warning: 'pdeo' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/fs/proc/inode.c:341:21: note: 'pdeo' was declared here Image Name: Linux-4.20.0-rc4-g4b78317679c4 Created: Sun Dec 2 11:45:02 2018 Image Type: SuperH Linux Kernel Image (gzip compressed) Data Size: 4535531 Bytes = 4429.23 KiB = 4.33 MiB Load Address: 88001000 Entry Point: 88002000 Image arch/sh/boot/uImage is ready Completed OK # rm -rf /kisskb/build/linus_urquell_defconfig_sh4 # Build took: 0:00:42.410710