Skip to content

Commit 2a0fede

Browse files
torvaldstorvalds
committed
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cleanups from Ingo Molnar: "Misc cleanups" * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86, cpu, amd: Fix a shadowed variable situation um, x86: Fix vDSO build x86: Delete non-required instances of include <linux/init.h> x86, realmode: Pointer walk cleanups, pull out invariant use of __pa() x86/traps: Clean up error exception handler definitions
2 parents 06bc0f4 + d139336 commit 2a0fede

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+24
-74
lines changed

‎arch/x86/include/asm/mce.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ extern void mce_register_decode_chain(struct notifier_block *nb);
118118
extern void mce_unregister_decode_chain(struct notifier_block *nb);
119119

120120
#include <linux/percpu.h>
121-
#include <linux/init.h>
122121
#include <linux/atomic.h>
123122

124123
extern int mce_p5_enabled;

‎arch/x86/include/asm/mpspec.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#ifndef _ASM_X86_MPSPEC_H
22
#define _ASM_X86_MPSPEC_H
33

4-
#include <linux/init.h>
54

65
#include <asm/mpspec_def.h>
76
#include <asm/x86_init.h>

‎arch/x86/include/asm/processor.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ struct mm_struct;
2727
#include <linux/cache.h>
2828
#include <linux/threads.h>
2929
#include <linux/math64.h>
30-
#include <linux/init.h>
3130
#include <linux/err.h>
3231
#include <linux/irqflags.h>
3332

‎arch/x86/include/asm/ptrace.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ struct pt_regs {
6060

6161
#endif /* !__i386__ */
6262

63-
#include <linux/init.h>
6463
#ifdef CONFIG_PARAVIRT
6564
#include <asm/paravirt_types.h>
6665
#endif

‎arch/x86/include/asm/smp.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#define _ASM_X86_SMP_H
33
#ifndef __ASSEMBLY__
44
#include <linux/cpumask.h>
5-
#include <linux/init.h>
65
#include <asm/percpu.h>
76

87
/*

‎arch/x86/include/asm/timer.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#ifndef _ASM_X86_TIMER_H
22
#define _ASM_X86_TIMER_H
3-
#include <linux/init.h>
43
#include <linux/pm.h>
54
#include <linux/percpu.h>
65
#include <linux/interrupt.h>

‎arch/x86/kernel/apic/apic_flat_64.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include <linux/string.h>
1515
#include <linux/kernel.h>
1616
#include <linux/ctype.h>
17-
#include <linux/init.h>
1817
#include <linux/hardirq.h>
1918
#include <linux/module.h>
2019
#include <asm/smp.h>

‎arch/x86/kernel/apic/apic_noop.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include <linux/string.h>
1616
#include <linux/kernel.h>
1717
#include <linux/ctype.h>
18-
#include <linux/init.h>
1918
#include <linux/errno.h>
2019
#include <asm/fixmap.h>
2120
#include <asm/mpspec.h>

‎arch/x86/kernel/apic/ipi.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#include <linux/cpumask.h>
22
#include <linux/interrupt.h>
3-
#include <linux/init.h>
43

54
#include <linux/mm.h>
65
#include <linux/delay.h>

‎arch/x86/kernel/apic/summit_32.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#define pr_fmt(fmt) "summit: %s: " fmt, __func__
3030

3131
#include <linux/mm.h>
32-
#include <linux/init.h>
3332
#include <asm/io.h>
3433
#include <asm/bios_ebda.h>
3534

‎arch/x86/kernel/apic/x2apic_cluster.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#include <linux/string.h>
44
#include <linux/kernel.h>
55
#include <linux/ctype.h>
6-
#include <linux/init.h>
76
#include <linux/dmar.h>
87
#include <linux/cpu.h>
98

‎arch/x86/kernel/apic/x2apic_phys.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#include <linux/string.h>
44
#include <linux/kernel.h>
55
#include <linux/ctype.h>
6-
#include <linux/init.h>
76
#include <linux/dmar.h>
87

98
#include <asm/smp.h>

‎arch/x86/kernel/cpu/amd.c

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#include <linux/export.h>
2-
#include <linux/init.h>
32
#include <linux/bitops.h>
43
#include <linux/elf.h>
54
#include <linux/mm.h>
@@ -790,14 +789,10 @@ static void cpu_detect_tlb_amd(struct cpuinfo_x86 *c)
790789
}
791790

792791
/* Handle DTLB 2M and 4M sizes, fall back to L1 if L2 is disabled */
793-
if (!((eax >> 16) & mask)) {
794-
u32 a, b, c, d;
795-
796-
cpuid(0x80000005, &a, &b, &c, &d);
797-
tlb_lld_2m[ENTRIES] = (a >> 16) & 0xff;
798-
} else {
792+
if (!((eax >> 16) & mask))
793+
tlb_lld_2m[ENTRIES] = (cpuid_eax(0x80000005) >> 16) & 0xff;
794+
else
799795
tlb_lld_2m[ENTRIES] = (eax >> 16) & mask;
800-
}
801796

802797
/* a 4M entry uses two 2M entries */
803798
tlb_lld_4m[ENTRIES] = tlb_lld_2m[ENTRIES] >> 1;

‎arch/x86/kernel/cpu/centaur.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#include <linux/bitops.h>
22
#include <linux/kernel.h>
3-
#include <linux/init.h>
43

54
#include <asm/processor.h>
65
#include <asm/e820.h>

‎arch/x86/kernel/cpu/cyrix.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#include <linux/init.h>
21
#include <linux/bitops.h>
32
#include <linux/delay.h>
43
#include <linux/pci.h>

‎arch/x86/kernel/cpu/intel.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#include <linux/init.h>
21
#include <linux/kernel.h>
32

43
#include <linux/string.h>

‎arch/x86/kernel/cpu/mcheck/mce_intel.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
*/
77

88
#include <linux/gfp.h>
9-
#include <linux/init.h>
109
#include <linux/interrupt.h>
1110
#include <linux/percpu.h>
1211
#include <linux/sched.h>

‎arch/x86/kernel/cpu/mcheck/p5.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#include <linux/interrupt.h>
66
#include <linux/kernel.h>
77
#include <linux/types.h>
8-
#include <linux/init.h>
98
#include <linux/smp.h>
109

1110
#include <asm/processor.h>

‎arch/x86/kernel/cpu/mcheck/winchip.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#include <linux/interrupt.h>
66
#include <linux/kernel.h>
77
#include <linux/types.h>
8-
#include <linux/init.h>
98

109
#include <asm/processor.h>
1110
#include <asm/mce.h>

‎arch/x86/kernel/cpu/transmeta.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#include <linux/kernel.h>
22
#include <linux/mm.h>
3-
#include <linux/init.h>
43
#include <asm/processor.h>
54
#include <asm/msr.h>
65
#include "cpu.h"

‎arch/x86/kernel/cpu/umc.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#include <linux/kernel.h>
2-
#include <linux/init.h>
32
#include <asm/processor.h>
43
#include "cpu.h"
54

‎arch/x86/kernel/crash.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
*
88
*/
99

10-
#include <linux/init.h>
1110
#include <linux/types.h>
1211
#include <linux/kernel.h>
1312
#include <linux/smp.h>

‎arch/x86/kernel/doublefault.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#include <linux/mm.h>
22
#include <linux/sched.h>
3-
#include <linux/init.h>
43
#include <linux/init_task.h>
54
#include <linux/fs.h>
65

‎arch/x86/kernel/hw_breakpoint.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
#include <linux/kernel.h>
3939
#include <linux/module.h>
4040
#include <linux/sched.h>
41-
#include <linux/init.h>
4241
#include <linux/smp.h>
4342

4443
#include <asm/hw_breakpoint.h>

‎arch/x86/kernel/kgdb.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
#include <linux/sched.h>
4040
#include <linux/delay.h>
4141
#include <linux/kgdb.h>
42-
#include <linux/init.h>
4342
#include <linux/smp.h>
4443
#include <linux/nmi.h>
4544
#include <linux/hw_breakpoint.h>

‎arch/x86/kernel/machine_kexec_32.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include <linux/mm.h>
1010
#include <linux/kexec.h>
1111
#include <linux/delay.h>
12-
#include <linux/init.h>
1312
#include <linux/numa.h>
1413
#include <linux/ftrace.h>
1514
#include <linux/suspend.h>

‎arch/x86/kernel/pci-nommu.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#include <linux/dma-mapping.h>
44
#include <linux/scatterlist.h>
55
#include <linux/string.h>
6-
#include <linux/init.h>
76
#include <linux/gfp.h>
87
#include <linux/pci.h>
98
#include <linux/mm.h>

‎arch/x86/kernel/process_32.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include <linux/interrupt.h>
2525
#include <linux/delay.h>
2626
#include <linux/reboot.h>
27-
#include <linux/init.h>
2827
#include <linux/mc146818rtc.h>
2928
#include <linux/module.h>
3029
#include <linux/kallsyms.h>

‎arch/x86/kernel/traps.c

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -211,21 +211,17 @@ dotraplinkage void do_##name(struct pt_regs *regs, long error_code) \
211211
exception_exit(prev_state); \
212212
}
213213

214-
DO_ERROR_INFO(X86_TRAP_DE, SIGFPE, "divide error", divide_error, FPE_INTDIV,
215-
regs->ip)
216-
DO_ERROR(X86_TRAP_OF, SIGSEGV, "overflow", overflow)
217-
DO_ERROR(X86_TRAP_BR, SIGSEGV, "bounds", bounds)
218-
DO_ERROR_INFO(X86_TRAP_UD, SIGILL, "invalid opcode", invalid_op, ILL_ILLOPN,
219-
regs->ip)
220-
DO_ERROR(X86_TRAP_OLD_MF, SIGFPE, "coprocessor segment overrun",
221-
coprocessor_segment_overrun)
222-
DO_ERROR(X86_TRAP_TS, SIGSEGV, "invalid TSS", invalid_TSS)
223-
DO_ERROR(X86_TRAP_NP, SIGBUS, "segment not present", segment_not_present)
214+
DO_ERROR_INFO(X86_TRAP_DE, SIGFPE, "divide error", divide_error, FPE_INTDIV, regs->ip )
215+
DO_ERROR (X86_TRAP_OF, SIGSEGV, "overflow", overflow )
216+
DO_ERROR (X86_TRAP_BR, SIGSEGV, "bounds", bounds )
217+
DO_ERROR_INFO(X86_TRAP_UD, SIGILL, "invalid opcode", invalid_op, ILL_ILLOPN, regs->ip )
218+
DO_ERROR (X86_TRAP_OLD_MF, SIGFPE, "coprocessor segment overrun", coprocessor_segment_overrun )
219+
DO_ERROR (X86_TRAP_TS, SIGSEGV, "invalid TSS", invalid_TSS )
220+
DO_ERROR (X86_TRAP_NP, SIGBUS, "segment not present", segment_not_present )
224221
#ifdef CONFIG_X86_32
225-
DO_ERROR(X86_TRAP_SS, SIGBUS, "stack segment", stack_segment)
222+
DO_ERROR (X86_TRAP_SS, SIGBUS, "stack segment", stack_segment )
226223
#endif
227-
DO_ERROR_INFO(X86_TRAP_AC, SIGBUS, "alignment check", alignment_check,
228-
BUS_ADRALN, 0)
224+
DO_ERROR_INFO(X86_TRAP_AC, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0 )
229225

230226
#ifdef CONFIG_X86_64
231227
/* Runs on IST stack */

‎arch/x86/kernel/tsc_sync.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*/
1717
#include <linux/spinlock.h>
1818
#include <linux/kernel.h>
19-
#include <linux/init.h>
2019
#include <linux/smp.h>
2120
#include <linux/nmi.h>
2221
#include <asm/tsc.h>

‎arch/x86/lib/delay.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#include <linux/timex.h>
1717
#include <linux/preempt.h>
1818
#include <linux/delay.h>
19-
#include <linux/init.h>
2019

2120
#include <asm/processor.h>
2221
#include <asm/delay.h>

‎arch/x86/mm/kmmio.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include <linux/rculist.h>
1212
#include <linux/spinlock.h>
1313
#include <linux/hash.h>
14-
#include <linux/init.h>
1514
#include <linux/module.h>
1615
#include <linux/kernel.h>
1716
#include <linux/uaccess.h>

‎arch/x86/mm/pageattr-test.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#include <linux/kthread.h>
99
#include <linux/random.h>
1010
#include <linux/kernel.h>
11-
#include <linux/init.h>
1211
#include <linux/mm.h>
1312

1413
#include <asm/cacheflush.h>

‎arch/x86/pci/fixup.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#include <linux/delay.h>
66
#include <linux/dmi.h>
77
#include <linux/pci.h>
8-
#include <linux/init.h>
98
#include <linux/vgaarb.h>
109
#include <asm/pci_x86.h>
1110

‎arch/x86/platform/intel-mid/early_printk_intel_mid.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include <linux/console.h>
2323
#include <linux/kernel.h>
2424
#include <linux/delay.h>
25-
#include <linux/init.h>
2625
#include <linux/io.h>
2726

2827
#include <asm/fixmap.h>

‎arch/x86/platform/iris/iris.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include <linux/kernel.h>
2828
#include <linux/errno.h>
2929
#include <linux/delay.h>
30-
#include <linux/init.h>
3130
#include <linux/pm.h>
3231
#include <asm/io.h>
3332

‎arch/x86/realmode/init.c

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,10 @@ void __init reserve_real_mode(void)
2929
void __init setup_real_mode(void)
3030
{
3131
u16 real_mode_seg;
32-
u32 *rel;
32+
const u32 *rel;
3333
u32 count;
34-
u32 *ptr;
35-
u16 *seg;
36-
int i;
3734
unsigned char *base;
35+
unsigned long phys_base;
3836
struct trampoline_header *trampoline_header;
3937
size_t size = PAGE_ALIGN(real_mode_blob_end - real_mode_blob);
4038
#ifdef CONFIG_X86_64
@@ -46,23 +44,23 @@ void __init setup_real_mode(void)
4644

4745
memcpy(base, real_mode_blob, size);
4846

49-
real_mode_seg = __pa(base) >> 4;
47+
phys_base = __pa(base);
48+
real_mode_seg = phys_base >> 4;
49+
5050
rel = (u32 *) real_mode_relocs;
5151

5252
/* 16-bit segment relocations. */
53-
count = rel[0];
54-
rel = &rel[1];
55-
for (i = 0; i < count; i++) {
56-
seg = (u16 *) (base + rel[i]);
53+
count = *rel++;
54+
while (count--) {
55+
u16 *seg = (u16 *) (base + *rel++);
5756
*seg = real_mode_seg;
5857
}
5958

6059
/* 32-bit linear relocations. */
61-
count = rel[i];
62-
rel = &rel[i + 1];
63-
for (i = 0; i < count; i++) {
64-
ptr = (u32 *) (base + rel[i]);
65-
*ptr += __pa(base);
60+
count = *rel++;
61+
while (count--) {
62+
u32 *ptr = (u32 *) (base + *rel++);
63+
*ptr += phys_base;
6664
}
6765

6866
/* Must be perfomed *after* relocation. */

‎arch/x86/realmode/rm/reboot.S

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#include <linux/linkage.h>
2-
#include <linux/init.h>
32
#include <asm/segment.h>
43
#include <asm/page_types.h>
54
#include <asm/processor-flags.h>

‎arch/x86/realmode/rm/trampoline_32.S

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
*/
2121

2222
#include <linux/linkage.h>
23-
#include <linux/init.h>
2423
#include <asm/segment.h>
2524
#include <asm/page_types.h>
2625
#include "realmode.h"

‎arch/x86/realmode/rm/trampoline_64.S

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
*/
2626

2727
#include <linux/linkage.h>
28-
#include <linux/init.h>
2928
#include <asm/pgtable_types.h>
3029
#include <asm/page_types.h>
3130
#include <asm/msr.h>

‎arch/x86/vdso/vdso.S

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#include <asm/page_types.h>
22
#include <linux/linkage.h>
3-
#include <linux/init.h>
43

54
__PAGE_ALIGNED_DATA
65

‎arch/x86/vdso/vdsox32.S

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#include <asm/page_types.h>
22
#include <linux/linkage.h>
3-
#include <linux/init.h>
43

54
__PAGE_ALIGNED_DATA
65

0 commit comments

Comments
 (0)