The patch titled Subject: arch/x86/kernel/cpu/common.c: fix warning has been added to the -mm tree. Its filename is arch-x86-kernel-cpu-commonc-fix-warning.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/arch-x86-kernel-cpu-commonc-fix-warning.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/arch-x86-kernel-cpu-commonc-fix-warning.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: arch/x86/kernel/cpu/common.c: fix warning CONFIG_IA32_EMULATION=n: arch/x86/kernel/cpu/common.c: In function `syscall_init': arch/x86/kernel/cpu/common.c:1534:6: warning: unused variable `cpu' [-Wunused-variable] int cpu = smp_processor_id(); ^~~ Cc: Ingo Molnar <mingo@xxxxxxx> Cc: "H. Peter Anvin" <hpa@xxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/x86/kernel/cpu/common.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) --- a/arch/x86/kernel/cpu/common.c~arch-x86-kernel-cpu-commonc-fix-warning +++ a/arch/x86/kernel/cpu/common.c @@ -1531,8 +1531,6 @@ EXPORT_PER_CPU_SYMBOL(__preempt_count); /* May not be marked __init: used by software suspend */ void syscall_init(void) { - int cpu = smp_processor_id(); - wrmsr(MSR_STAR, 0, (__USER32_CS << 16) | __KERNEL_CS); wrmsrl(MSR_LSTAR, (unsigned long)entry_SYSCALL_64); @@ -1545,7 +1543,8 @@ void syscall_init(void) * AMD doesn't allow SYSENTER in long mode (either 32- or 64-bit). */ wrmsrl_safe(MSR_IA32_SYSENTER_CS, (u64)__KERNEL_CS); - wrmsrl_safe(MSR_IA32_SYSENTER_ESP, (unsigned long)(cpu_entry_stack(cpu) + 1)); + wrmsrl_safe(MSR_IA32_SYSENTER_ESP, + (unsigned long)(cpu_entry_stack(smp_processor_id()) + 1)); wrmsrl_safe(MSR_IA32_SYSENTER_EIP, (u64)entry_SYSENTER_compat); #else wrmsrl(MSR_CSTAR, (unsigned long)ignore_sysret); _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are fix-crash-on-ocfs2_duplicate_clusters_by_page-v5-checkpatch-fixes.patch proc-kcore-fix-invalid-memory-access-in-multi-page-read-optimization-v3-fix.patch arm-arch-arm-include-asm-pageh-needs-personalityh.patch fix-clusters-leak-in-ocfs2_defrag_extent-fix.patch mm.patch mmpage_alloc-pf_wq_worker-threads-must-sleep-at-should_reclaim_retry-fix.patch mm-calculate-deferred-pages-after-skipping-mirrored-memory-fix.patch list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch lib-bitmapc-fix-remaining-space-computation-in-bitmap_print_to_pagebuf-fix.patch lib-bitmapc-fix-remaining-space-computation-in-bitmap_print_to_pagebuf-fix-fix.patch ipc-allow-boot-time-extension-of-ipcmni-from-32k-to-8m-checkpatch-fixes.patch linux-next-rejects.patch arch-x86-kernel-cpu-commonc-fix-warning.patch kernel-forkc-export-kernel_thread-to-modules.patch slab-leaks3-default-y.patch