x86/cleanups for v3.14
Subsystems (6)
Linus,
Please pull the latest x86-cleanups-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-cleanups-for-linus
# HEAD: d139336700a5f3a560da235e4dfcd286773025d4 x86, cpu, amd: Fix a shadowed variable situation
Misc cleanups.
Thanks,
Ingo
------------------>
Borislav Petkov (1):
x86, cpu, amd: Fix a shadowed variable situation
H. Peter Anvin (1):
x86, realmode: Pointer walk cleanups, pull out invariant use of __pa()
Ingo Molnar (1):
x86/traps: Clean up error exception handler definitions
Paul Gortmaker (1):
x86: Delete non-required instances of include <linux/init.h>
Richard Weinberger (1):
um, x86: Fix vDSO build
arch/x86/include/asm/mce.h | 1 - arch/x86/include/asm/mpspec.h | 1 - arch/x86/include/asm/processor.h | 1 - arch/x86/include/asm/ptrace.h | 1 - arch/x86/include/asm/smp.h | 1 - arch/x86/include/asm/timer.h | 1 - arch/x86/kernel/apic/apic_flat_64.c | 1 - arch/x86/kernel/apic/apic_noop.c | 1 - arch/x86/kernel/apic/ipi.c | 1 - arch/x86/kernel/apic/summit_32.c | 1 - arch/x86/kernel/apic/x2apic_cluster.c | 1 - arch/x86/kernel/apic/x2apic_phys.c | 1 - arch/x86/kernel/cpu/amd.c | 11 +++------ arch/x86/kernel/cpu/centaur.c | 1 - arch/x86/kernel/cpu/cyrix.c | 1 - arch/x86/kernel/cpu/intel.c | 1 - arch/x86/kernel/cpu/mcheck/mce_intel.c | 1 - arch/x86/kernel/cpu/mcheck/p5.c | 1 - arch/x86/kernel/cpu/mcheck/winchip.c | 1 - arch/x86/kernel/cpu/transmeta.c | 1 - arch/x86/kernel/cpu/umc.c | 1 - arch/x86/kernel/crash.c | 1 - arch/x86/kernel/doublefault.c | 1 - arch/x86/kernel/hw_breakpoint.c | 1 - arch/x86/kernel/kgdb.c | 1 - arch/x86/kernel/machine_kexec_32.c | 1 - arch/x86/kernel/pci-nommu.c | 1 - arch/x86/kernel/process_32.c | 1 - arch/x86/kernel/traps.c | 22 ++++++++---------- arch/x86/kernel/tsc_sync.c | 1 - arch/x86/lib/delay.c | 1 - arch/x86/mm/kmmio.c | 1 - arch/x86/mm/pageattr-test.c | 1 - arch/x86/pci/fixup.c | 1 - .../platform/intel-mid/early_printk_intel_mid.c | 1 - arch/x86/platform/iris/iris.c | 1 - arch/x86/realmode/init.c | 26 ++++++++++------------ arch/x86/realmode/rm/reboot.S | 1 - arch/x86/realmode/rm/trampoline_32.S | 1 - arch/x86/realmode/rm/trampoline_64.S | 1 - arch/x86/vdso/vdso.S | 1 - arch/x86/vdso/vdsox32.S | 1 - 42 files changed, 24 insertions(+), 74 deletions(-)
arch/x86/include/asm/mce.h +0 -1
@@ -118,7 +118,6 @@ extern void mce_register_decode_chain(struct notifier_block *nb);extern void mce_unregister_decode_chain (struct notifier_block *nb);#include <linux/percpu.h> -#include <linux/init.h> #include <linux/atomic.h> extern int mce_p5_enabled;
arch/x86/include/asm/mpspec.h +0 -1
@@ -1,7 +1,6 @@#ifndef _ASM_X86_MPSPEC_H#define _ASM_X86_MPSPEC_H -#include <linux/init.h> #include <asm/mpspec_def.h> #include <asm/x86_init.h>
arch/x86/include/asm/processor.h +0 -1
@@ -27,7 +27,6 @@ struct mm_struct;#include <linux/cache.h> #include <linux/threads.h> #include <linux/math64.h> -#include <linux/init.h> #include <linux/err.h> #include <linux/irqflags.h>
arch/x86/include/asm/ptrace.h +0 -1
@@ -60,7 +60,6 @@ struct pt_regs {#endif /* !__i386__ */ -#include <linux/init.h> #ifdef CONFIG_PARAVIRT #include <asm/paravirt_types.h> #endif
arch/x86/include/asm/smp.h +0 -1
@@ -2,7 +2,6 @@#define _ASM_X86_SMP_H#ifndef __ASSEMBLY__#include <linux/cpumask.h> -#include <linux/init.h> #include <asm/percpu.h> /*
arch/x86/include/asm/timer.h +0 -1
@@ -1,6 +1,5 @@#ifndef _ASM_X86_TIMER_H#define _ASM_X86_TIMER_H -#include <linux/init.h> #include <linux/pm.h> #include <linux/percpu.h> #include <linux/interrupt.h>
arch/x86/kernel/apic/apic_flat_64.c +0 -1
@@ -14,7 +14,6 @@#include <linux/string.h> #include <linux/kernel.h> #include <linux/ctype.h> -#include <linux/init.h> #include <linux/hardirq.h> #include <linux/module.h> #include <asm/smp.h>
arch/x86/kernel/apic/apic_noop.c +0 -1
@@ -15,7 +15,6 @@#include <linux/string.h> #include <linux/kernel.h> #include <linux/ctype.h> -#include <linux/init.h> #include <linux/errno.h> #include <asm/fixmap.h> #include <asm/mpspec.h>
arch/x86/kernel/apic/ipi.c +0 -1
@@ -1,6 +1,5 @@#include <linux/cpumask.h> #include <linux/interrupt.h> -#include <linux/init.h> #include <linux/mm.h> #include <linux/delay.h>
arch/x86/kernel/apic/summit_32.c +0 -1
@@ -29,7 +29,6 @@#define pr_fmt (fmt) "summit: %s: " fmt, __func__#include <linux/mm.h> -#include <linux/init.h> #include <asm/io.h> #include <asm/bios_ebda.h>
arch/x86/kernel/apic/x2apic_cluster.c +0 -1
@@ -3,7 +3,6 @@#include <linux/string.h> #include <linux/kernel.h> #include <linux/ctype.h> -#include <linux/init.h> #include <linux/dmar.h> #include <linux/cpu.h>
arch/x86/kernel/apic/x2apic_phys.c +0 -1
@@ -3,7 +3,6 @@#include <linux/string.h> #include <linux/kernel.h> #include <linux/ctype.h> -#include <linux/init.h> #include <linux/dmar.h> #include <asm/smp.h>
arch/x86/kernel/cpu/amd.c +3 -8
@@ -1,5 +1,4 @@#include <linux/export.h> -#include <linux/init.h> #include <linux/bitops.h> #include <linux/elf.h> #include <linux/mm.h>
@@ -790,14 +789,10 @@ static void cpu_detect_tlb_amd(struct cpuinfo_x86 *c) }/* Handle DTLB 2M and 4M sizes, fall back to L1 if L2 is disabled */ -if (!((eax >>16 ) & mask)) { -u32 a, b, c, d; - -cpuid (0x80000005 , &a, &b, &c, &d); - tlb_lld_2m[ENTRIES ] = (a >>16 ) &0xff ; - }else { +if (!((eax >>16 ) & mask)) + tlb_lld_2m[ENTRIES ] = (cpuid_eax (0x80000005 ) >>16 ) &0xff ; +else tlb_lld_2m[ENTRIES ] = (eax >>16 ) & mask; - }/* a 4M entry uses two 2M entries */ tlb_lld_4m[ENTRIES ] = tlb_lld_2m[ENTRIES ] >>1 ;
arch/x86/kernel/cpu/centaur.c +0 -1
@@ -1,6 +1,5 @@#include <linux/bitops.h> #include <linux/kernel.h> -#include <linux/init.h> #include <asm/processor.h> #include <asm/e820.h>
arch/x86/kernel/cpu/cyrix.c +0 -1
@@ -1,4 +1,3 @@ -#include <linux/init.h> #include <linux/bitops.h> #include <linux/delay.h> #include <linux/pci.h>
arch/x86/kernel/cpu/intel.c +0 -1
@@ -1,4 +1,3 @@ -#include <linux/init.h> #include <linux/kernel.h> #include <linux/string.h>
arch/x86/kernel/cpu/mcheck/mce_intel.c +0 -1
@@ -6,7 +6,6 @@*/ #include <linux/gfp.h> -#include <linux/init.h> #include <linux/interrupt.h> #include <linux/percpu.h> #include <linux/sched.h>
arch/x86/kernel/cpu/mcheck/p5.c +0 -1
@@ -5,7 +5,6 @@#include <linux/interrupt.h> #include <linux/kernel.h> #include <linux/types.h> -#include <linux/init.h> #include <linux/smp.h> #include <asm/processor.h>
arch/x86/kernel/cpu/mcheck/winchip.c +0 -1
@@ -5,7 +5,6 @@#include <linux/interrupt.h> #include <linux/kernel.h> #include <linux/types.h> -#include <linux/init.h> #include <asm/processor.h> #include <asm/mce.h>
arch/x86/kernel/cpu/transmeta.c +0 -1
@@ -1,6 +1,5 @@#include <linux/kernel.h> #include <linux/mm.h> -#include <linux/init.h> #include <asm/processor.h> #include <asm/msr.h> #include "cpu.h"
arch/x86/kernel/cpu/umc.c +0 -1
@@ -1,5 +1,4 @@#include <linux/kernel.h> -#include <linux/init.h> #include <asm/processor.h> #include "cpu.h"
arch/x86/kernel/crash.c +0 -1
@@ -7,7 +7,6 @@* */ -#include <linux/init.h> #include <linux/types.h> #include <linux/kernel.h> #include <linux/smp.h>
arch/x86/kernel/doublefault.c +0 -1
@@ -1,6 +1,5 @@#include <linux/mm.h> #include <linux/sched.h> -#include <linux/init.h> #include <linux/init_task.h> #include <linux/fs.h>
arch/x86/kernel/hw_breakpoint.c +0 -1
@@ -38,7 +38,6 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/sched.h> -#include <linux/init.h> #include <linux/smp.h> #include <asm/hw_breakpoint.h>
arch/x86/kernel/kgdb.c +0 -1
@@ -39,7 +39,6 @@#include <linux/sched.h> #include <linux/delay.h> #include <linux/kgdb.h> -#include <linux/init.h> #include <linux/smp.h> #include <linux/nmi.h> #include <linux/hw_breakpoint.h>
arch/x86/kernel/machine_kexec_32.c +0 -1
@@ -9,7 +9,6 @@#include <linux/mm.h> #include <linux/kexec.h> #include <linux/delay.h> -#include <linux/init.h> #include <linux/numa.h> #include <linux/ftrace.h> #include <linux/suspend.h>
arch/x86/kernel/pci-nommu.c +0 -1
@@ -3,7 +3,6 @@#include <linux/dma-mapping.h> #include <linux/scatterlist.h> #include <linux/string.h> -#include <linux/init.h> #include <linux/gfp.h> #include <linux/pci.h> #include <linux/mm.h>
arch/x86/kernel/process_32.c +0 -1
@@ -24,7 +24,6 @@#include <linux/interrupt.h> #include <linux/delay.h> #include <linux/reboot.h> -#include <linux/init.h> #include <linux/mc146818rtc.h> #include <linux/module.h> #include <linux/kallsyms.h>
arch/x86/kernel/traps.c +9 -13
@@ -211,21 +211,17 @@ dotraplinkage void do_##name(struct pt_regs *regs, long error_code) \exception_exit (prev_state); \ } -DO_ERROR_INFO (X86_TRAP_DE ,SIGFPE ,"divide error" , divide_error,FPE_INTDIV , - regs->ip) -DO_ERROR(X86_TRAP_OF, SIGSEGV, "overflow", overflow) -DO_ERROR(X86_TRAP_BR, SIGSEGV, "bounds", bounds) -DO_ERROR_INFO (X86_TRAP_UD ,SIGILL ,"invalid opcode" , invalid_op,ILL_ILLOPN , - regs->ip) -DO_ERROR (X86_TRAP_OLD_MF ,SIGFPE ,"coprocessor segment overrun" , - coprocessor_segment_overrun) -DO_ERROR(X86_TRAP_TS, SIGSEGV, "invalid TSS", invalid_TSS) -DO_ERROR(X86_TRAP_NP, SIGBUS, "segment not present", segment_not_present) +DO_ERROR_INFO (X86_TRAP_DE ,SIGFPE ,"divide error" , divide_error,FPE_INTDIV , regs->ip ) +DO_ERROR (X86_TRAP_OF, SIGSEGV, "overflow", overflow ) +DO_ERROR (X86_TRAP_BR, SIGSEGV, "bounds", bounds ) +DO_ERROR_INFO (X86_TRAP_UD ,SIGILL ,"invalid opcode" , invalid_op,ILL_ILLOPN , regs->ip ) +DO_ERROR (X86_TRAP_OLD_MF, SIGFPE, "coprocessor segment overrun", coprocessor_segment_overrun ) +DO_ERROR (X86_TRAP_TS, SIGSEGV, "invalid TSS", invalid_TSS ) +DO_ERROR (X86_TRAP_NP, SIGBUS, "segment not present", segment_not_present )#ifdef CONFIG_X86_32 -DO_ERROR(X86_TRAP_SS, SIGBUS, "stack segment", stack_segment) +DO_ERROR (X86_TRAP_SS, SIGBUS, "stack segment", stack_segment )#endif -DO_ERROR_INFO (X86_TRAP_AC ,SIGBUS ,"alignment check" , alignment_check, - BUS_ADRALN, 0) +DO_ERROR_INFO(X86_TRAP_AC, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0 )#ifdef CONFIG_X86_64 /* Runs on IST stack */
arch/x86/kernel/tsc_sync.c +0 -1
@@ -16,7 +16,6 @@*/ #include <linux/spinlock.h> #include <linux/kernel.h> -#include <linux/init.h> #include <linux/smp.h> #include <linux/nmi.h> #include <asm/tsc.h>
arch/x86/lib/delay.c +0 -1
@@ -16,7 +16,6 @@#include <linux/timex.h> #include <linux/preempt.h> #include <linux/delay.h> -#include <linux/init.h> #include <asm/processor.h> #include <asm/delay.h>
arch/x86/mm/kmmio.c +0 -1
@@ -11,7 +11,6 @@#include <linux/rculist.h> #include <linux/spinlock.h> #include <linux/hash.h> -#include <linux/init.h> #include <linux/module.h> #include <linux/kernel.h> #include <linux/uaccess.h>
arch/x86/mm/pageattr-test.c +0 -1
@@ -8,7 +8,6 @@#include <linux/kthread.h> #include <linux/random.h> #include <linux/kernel.h> -#include <linux/init.h> #include <linux/mm.h> #include <asm/cacheflush.h>
arch/x86/pci/fixup.c +0 -1
@@ -5,7 +5,6 @@#include <linux/delay.h> #include <linux/dmi.h> #include <linux/pci.h> -#include <linux/init.h> #include <linux/vgaarb.h> #include <asm/pci_x86.h>
arch/x86/platform/intel-mid/early_printk_intel_mid.c +0 -1
@@ -22,7 +22,6 @@#include <linux/console.h> #include <linux/kernel.h> #include <linux/delay.h> -#include <linux/init.h> #include <linux/io.h> #include <asm/fixmap.h>
arch/x86/platform/iris/iris.c +0 -1
@@ -27,7 +27,6 @@#include <linux/kernel.h> #include <linux/errno.h> #include <linux/delay.h> -#include <linux/init.h> #include <linux/pm.h> #include <asm/io.h>
arch/x86/realmode/init.c +12 -14
@@ -29,12 +29,10 @@ void __init reserve_real_mode(void)void __init setup_real_mode (void ) {u16 real_mode_seg; -u32 *rel; +const u32 *rel;u32 count; -u32 *ptr; -u16 *seg; -int i;unsigned char *base; +unsigned long phys_base;struct trampoline_header *trampoline_header;size_t size =PAGE_ALIGN (real_mode_blob_end - real_mode_blob);#ifdef CONFIG_X86_64
@@ -46,23 +44,23 @@ void __init setup_real_mode(void)memcpy (base, real_mode_blob, size); - real_mode_seg =__pa (base) >>4 ; + phys_base =__pa (base); + real_mode_seg = phys_base >>4 ; + rel = (u32 *) real_mode_relocs;/* 16-bit segment relocations. */ - count = rel[0 ]; - rel = &rel[1 ]; -for (i =0 ; i < count; i++) { - seg = (u16 *) (base + rel[i]); + count = *rel++; +while (count--) { +u16 *seg = (u16 *) (base + *rel++); *seg = real_mode_seg; }/* 32-bit linear relocations. */ - count = rel[i]; - rel = &rel[i +1 ]; -for (i =0 ; i < count; i++) { - ptr = (u32 *) (base + rel[i]); - *ptr +=__pa (base); + count = *rel++; +while (count--) { +u32 *ptr = (u32 *) (base + *rel++); + *ptr += phys_base; }/* Must be perfomed *after* relocation. */
arch/x86/realmode/rm/reboot.S +0 -1
@@ -1,5 +1,4 @@ #include <linux/linkage.h> -#include <linux/init.h> #include <asm/segment.h> #include <asm/page_types.h> #include <asm/processor-flags.h>
arch/x86/realmode/rm/trampoline_32.S +0 -1
@@ -20,7 +20,6 @@ */ #include <linux/linkage.h> -#include <linux/init.h> #include <asm/segment.h> #include <asm/page_types.h> #include "realmode.h"
arch/x86/realmode/rm/trampoline_64.S +0 -1
@@ -25,7 +25,6 @@ */ #include <linux/linkage.h> -#include <linux/init.h> #include <asm/pgtable_types.h> #include <asm/page_types.h> #include <asm/msr.h>
arch/x86/vdso/vdso.S +0 -1
@@ -1,6 +1,5 @@ #include <asm/page_types.h> #include <linux/linkage.h> -#include <linux/init.h> __PAGE_ALIGNED_DATA
arch/x86/vdso/vdsox32.S +0 -1
@@ -1,6 +1,5 @@ #include <asm/page_types.h> #include <linux/linkage.h> -#include <linux/init.h> __PAGE_ALIGNED_DATA