* [PATCH] x86: delete non-required instances of include <linux/init.h>
@ 2014-01-07 0:20 Paul Gortmaker
2014-01-07 5:15 ` [tip:x86/cleanups] x86: Delete " tip-bot for Paul Gortmaker
` (2 more replies)
0 siblings, 3 replies; 17+ messages in thread
From: Paul Gortmaker @ 2014-01-07 0:20 UTC (permalink / raw)
To: x86; +Cc: linux-kernel, Paul Gortmaker
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
[build tested allyes/modconfig on x86/build from today's tip tree]
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 | 1 -
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/head_32.S | 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/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 -
arch/x86/platform/intel-mid/early_printk_intel_mid.c | 1 -
arch/x86/platform/iris/iris.c | 1 -
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/um/vdso/vdso.S | 1 -
arch/x86/vdso/vdso.S | 1 -
arch/x86/vdso/vdsox32.S | 1 -
42 files changed, 42 deletions(-)
diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h
index c696a8687567..6e4ce2df87cf 100644
--- a/arch/x86/include/asm/mce.h
+++ b/arch/x86/include/asm/mce.h
@@ -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;
diff --git a/arch/x86/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h
index 3142a94c7b4b..3e6b4920ef5d 100644
--- a/arch/x86/include/asm/mpspec.h
+++ b/arch/x86/include/asm/mpspec.h
@@ -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>
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index 7b034a4057f9..8ade61721ffb 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -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>
diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
index 942a08623a1a..14fd6fd75a19 100644
--- a/arch/x86/include/asm/ptrace.h
+++ b/arch/x86/include/asm/ptrace.h
@@ -60,7 +60,6 @@ struct pt_regs {
#endif /* !__i386__ */
-#include <linux/init.h>
#ifdef CONFIG_PARAVIRT
#include <asm/paravirt_types.h>
#endif
diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
index 4137890e88e3..8cd27e08e23c 100644
--- a/arch/x86/include/asm/smp.h
+++ b/arch/x86/include/asm/smp.h
@@ -2,7 +2,6 @@
#define _ASM_X86_SMP_H
#ifndef __ASSEMBLY__
#include <linux/cpumask.h>
-#include <linux/init.h>
#include <asm/percpu.h>
/*
diff --git a/arch/x86/include/asm/timer.h b/arch/x86/include/asm/timer.h
index 34baa0eb5d0c..a6f3e776d2e4 100644
--- a/arch/x86/include/asm/timer.h
+++ b/arch/x86/include/asm/timer.h
@@ -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>
diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
index 00c77cf78e9e..5d5b9eb2b7a4 100644
--- a/arch/x86/kernel/apic/apic_flat_64.c
+++ b/arch/x86/kernel/apic/apic_flat_64.c
@@ -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>
diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
index e145f28b4099..191ce75c0e54 100644
--- a/arch/x86/kernel/apic/apic_noop.c
+++ b/arch/x86/kernel/apic/apic_noop.c
@@ -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>
diff --git a/arch/x86/kernel/apic/ipi.c b/arch/x86/kernel/apic/ipi.c
index 7434d8556d09..62071569bd50 100644
--- a/arch/x86/kernel/apic/ipi.c
+++ b/arch/x86/kernel/apic/ipi.c
@@ -1,6 +1,5 @@
#include <linux/cpumask.h>
#include <linux/interrupt.h>
-#include <linux/init.h>
#include <linux/mm.h>
#include <linux/delay.h>
diff --git a/arch/x86/kernel/apic/summit_32.c b/arch/x86/kernel/apic/summit_32.c
index 77c95c0e1bf7..00146f9b0254 100644
--- a/arch/x86/kernel/apic/summit_32.c
+++ b/arch/x86/kernel/apic/summit_32.c
@@ -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>
diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
index 140e29db478d..cac85ee6913f 100644
--- a/arch/x86/kernel/apic/x2apic_cluster.c
+++ b/arch/x86/kernel/apic/x2apic_cluster.c
@@ -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>
diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
index 562a76d433c8..de231e328cae 100644
--- a/arch/x86/kernel/apic/x2apic_phys.c
+++ b/arch/x86/kernel/apic/x2apic_phys.c
@@ -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>
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index bca023bdd6b2..39bc78dad377 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -1,5 +1,4 @@
#include <linux/export.h>
-#include <linux/init.h>
#include <linux/bitops.h>
#include <linux/elf.h>
#include <linux/mm.h>
diff --git a/arch/x86/kernel/cpu/centaur.c b/arch/x86/kernel/cpu/centaur.c
index 8d5652dc99dd..8779edab684e 100644
--- a/arch/x86/kernel/cpu/centaur.c
+++ b/arch/x86/kernel/cpu/centaur.c
@@ -1,6 +1,5 @@
#include <linux/bitops.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <asm/processor.h>
#include <asm/e820.h>
diff --git a/arch/x86/kernel/cpu/cyrix.c b/arch/x86/kernel/cpu/cyrix.c
index d0969c75ab54..aaf152e79637 100644
--- a/arch/x86/kernel/cpu/cyrix.c
+++ b/arch/x86/kernel/cpu/cyrix.c
@@ -1,4 +1,3 @@
-#include <linux/init.h>
#include <linux/bitops.h>
#include <linux/delay.h>
#include <linux/pci.h>
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index ea04b342c026..e0d317e6c641 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -1,4 +1,3 @@
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/string.h>
diff --git a/arch/x86/kernel/cpu/mcheck/mce_intel.c b/arch/x86/kernel/cpu/mcheck/mce_intel.c
index 4cfe0458ca66..fb6156fee6f7 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_intel.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_intel.c
@@ -6,7 +6,6 @@
*/
#include <linux/gfp.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/percpu.h>
#include <linux/sched.h>
diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
index 1c044b1ccc59..a3042989398c 100644
--- a/arch/x86/kernel/cpu/mcheck/p5.c
+++ b/arch/x86/kernel/cpu/mcheck/p5.c
@@ -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>
diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
index e9a701aecaa1..7dc5564d0cdf 100644
--- a/arch/x86/kernel/cpu/mcheck/winchip.c
+++ b/arch/x86/kernel/cpu/mcheck/winchip.c
@@ -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>
diff --git a/arch/x86/kernel/cpu/transmeta.c b/arch/x86/kernel/cpu/transmeta.c
index aa0430d69b90..3fa0e5ad86b4 100644
--- a/arch/x86/kernel/cpu/transmeta.c
+++ b/arch/x86/kernel/cpu/transmeta.c
@@ -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"
diff --git a/arch/x86/kernel/cpu/umc.c b/arch/x86/kernel/cpu/umc.c
index 75c5ad5d35cc..ef9c2a0078bd 100644
--- a/arch/x86/kernel/cpu/umc.c
+++ b/arch/x86/kernel/cpu/umc.c
@@ -1,5 +1,4 @@
#include <linux/kernel.h>
-#include <linux/init.h>
#include <asm/processor.h>
#include "cpu.h"
diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
index 18677a90d6a3..a57902efe2d5 100644
--- a/arch/x86/kernel/crash.c
+++ b/arch/x86/kernel/crash.c
@@ -7,7 +7,6 @@
*
*/
-#include <linux/init.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/smp.h>
diff --git a/arch/x86/kernel/doublefault.c b/arch/x86/kernel/doublefault.c
index 5d3fe8d36e4a..f6dfd9334b67 100644
--- a/arch/x86/kernel/doublefault.c
+++ b/arch/x86/kernel/doublefault.c
@@ -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>
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index 81ba27679f18..d18be9c7d202 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -8,7 +8,6 @@
.text
#include <linux/threads.h>
-#include <linux/init.h>
#include <linux/linkage.h>
#include <asm/segment.h>
#include <asm/page_types.h>
diff --git a/arch/x86/kernel/hw_breakpoint.c b/arch/x86/kernel/hw_breakpoint.c
index f66ff162dce8..a67b47c31314 100644
--- a/arch/x86/kernel/hw_breakpoint.c
+++ b/arch/x86/kernel/hw_breakpoint.c
@@ -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>
diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
index 836f8322960e..7ec1d5f8d283 100644
--- a/arch/x86/kernel/kgdb.c
+++ b/arch/x86/kernel/kgdb.c
@@ -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>
diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
index 5b19e4d78b00..1667b1de8d5d 100644
--- a/arch/x86/kernel/machine_kexec_32.c
+++ b/arch/x86/kernel/machine_kexec_32.c
@@ -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>
diff --git a/arch/x86/kernel/pci-nommu.c b/arch/x86/kernel/pci-nommu.c
index 871be4a84c7d..da15918d1c81 100644
--- a/arch/x86/kernel/pci-nommu.c
+++ b/arch/x86/kernel/pci-nommu.c
@@ -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>
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
index 6f1236c29c4b..0de43e98ce08 100644
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@ -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>
diff --git a/arch/x86/kernel/tsc_sync.c b/arch/x86/kernel/tsc_sync.c
index adfdf56a3714..26488487bc61 100644
--- a/arch/x86/kernel/tsc_sync.c
+++ b/arch/x86/kernel/tsc_sync.c
@@ -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>
diff --git a/arch/x86/lib/delay.c b/arch/x86/lib/delay.c
index 7c3bee636e2f..39d6a3db0b96 100644
--- a/arch/x86/lib/delay.c
+++ b/arch/x86/lib/delay.c
@@ -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>
diff --git a/arch/x86/mm/kmmio.c b/arch/x86/mm/kmmio.c
index e5d5e2ce9f77..637ab34ed632 100644
--- a/arch/x86/mm/kmmio.c
+++ b/arch/x86/mm/kmmio.c
@@ -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>
diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c
index d0b1773d9d2e..461bc8289024 100644
--- a/arch/x86/mm/pageattr-test.c
+++ b/arch/x86/mm/pageattr-test.c
@@ -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>
diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c
index b046e070e088..bca9e85daaa5 100644
--- a/arch/x86/pci/fixup.c
+++ b/arch/x86/pci/fixup.c
@@ -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>
diff --git a/arch/x86/platform/intel-mid/early_printk_intel_mid.c b/arch/x86/platform/intel-mid/early_printk_intel_mid.c
index 4f702f554f6e..e0bd082a80e0 100644
--- a/arch/x86/platform/intel-mid/early_printk_intel_mid.c
+++ b/arch/x86/platform/intel-mid/early_printk_intel_mid.c
@@ -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>
diff --git a/arch/x86/platform/iris/iris.c b/arch/x86/platform/iris/iris.c
index e6cb80f620af..4d171e8640ef 100644
--- a/arch/x86/platform/iris/iris.c
+++ b/arch/x86/platform/iris/iris.c
@@ -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>
diff --git a/arch/x86/realmode/rm/reboot.S b/arch/x86/realmode/rm/reboot.S
index f932ea61d1c8..d66c607bdc58 100644
--- a/arch/x86/realmode/rm/reboot.S
+++ b/arch/x86/realmode/rm/reboot.S
@@ -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>
diff --git a/arch/x86/realmode/rm/trampoline_32.S b/arch/x86/realmode/rm/trampoline_32.S
index c1b2791183e7..48ddd76bc4c3 100644
--- a/arch/x86/realmode/rm/trampoline_32.S
+++ b/arch/x86/realmode/rm/trampoline_32.S
@@ -20,7 +20,6 @@
*/
#include <linux/linkage.h>
-#include <linux/init.h>
#include <asm/segment.h>
#include <asm/page_types.h>
#include "realmode.h"
diff --git a/arch/x86/realmode/rm/trampoline_64.S b/arch/x86/realmode/rm/trampoline_64.S
index bb360dc39d21..dac7b20d2f9d 100644
--- a/arch/x86/realmode/rm/trampoline_64.S
+++ b/arch/x86/realmode/rm/trampoline_64.S
@@ -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>
diff --git a/arch/x86/um/vdso/vdso.S b/arch/x86/um/vdso/vdso.S
index 1cb468adacbb..4b4bd4cc06ab 100644
--- a/arch/x86/um/vdso/vdso.S
+++ b/arch/x86/um/vdso/vdso.S
@@ -1,4 +1,3 @@
-#include <linux/init.h>
__INITDATA
diff --git a/arch/x86/vdso/vdso.S b/arch/x86/vdso/vdso.S
index 01f5e3b4613c..1e13eb8c9656 100644
--- a/arch/x86/vdso/vdso.S
+++ b/arch/x86/vdso/vdso.S
@@ -1,6 +1,5 @@
#include <asm/page_types.h>
#include <linux/linkage.h>
-#include <linux/init.h>
__PAGE_ALIGNED_DATA
diff --git a/arch/x86/vdso/vdsox32.S b/arch/x86/vdso/vdsox32.S
index d6b9a7f42a8a..295f1c7543d8 100644
--- a/arch/x86/vdso/vdsox32.S
+++ b/arch/x86/vdso/vdsox32.S
@@ -1,6 +1,5 @@
#include <asm/page_types.h>
#include <linux/linkage.h>
-#include <linux/init.h>
__PAGE_ALIGNED_DATA
--
1.8.5.2
^ permalink raw reply related [flat|nested] 17+ messages in thread* [tip:x86/cleanups] x86: Delete non-required instances of include <linux/init.h>
2014-01-07 0:20 [PATCH] x86: delete non-required instances of include <linux/init.h> Paul Gortmaker
@ 2014-01-07 5:15 ` tip-bot for Paul Gortmaker
2014-01-07 5:22 ` [PATCH] x86: delete " H. Peter Anvin
2014-01-07 5:27 ` [tip:x86/cleanups] x86: Delete " tip-bot for Paul Gortmaker
2 siblings, 0 replies; 17+ messages in thread
From: tip-bot for Paul Gortmaker @ 2014-01-07 5:15 UTC (permalink / raw)
To: linux-tip-commits; +Cc: linux-kernel, hpa, mingo, tglx, paul.gortmaker
Commit-ID: 0262b6690132600c6e77534a639519be3f36f8f5
Gitweb: http://git.kernel.org/tip/0262b6690132600c6e77534a639519be3f36f8f5
Author: Paul Gortmaker <paul.gortmaker@windriver.com>
AuthorDate: Mon, 6 Jan 2014 19:20:26 -0500
Committer: H. Peter Anvin <hpa@zytor.com>
CommitDate: Mon, 6 Jan 2014 21:14:15 -0800
x86: Delete non-required instances of include <linux/init.h>
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Link: http://lkml.kernel.org/r/1389054026-12947-1-git-send-email-paul.gortmaker@windriver.com
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---
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 | 1 -
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/head_32.S | 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/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 -
arch/x86/platform/intel-mid/early_printk_intel_mid.c | 1 -
arch/x86/platform/iris/iris.c | 1 -
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/um/vdso/vdso.S | 1 -
arch/x86/vdso/vdso.S | 1 -
arch/x86/vdso/vdsox32.S | 1 -
42 files changed, 42 deletions(-)
diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h
index c696a86..6e4ce2d 100644
--- a/arch/x86/include/asm/mce.h
+++ b/arch/x86/include/asm/mce.h
@@ -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;
diff --git a/arch/x86/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h
index 3142a94..3e6b492 100644
--- a/arch/x86/include/asm/mpspec.h
+++ b/arch/x86/include/asm/mpspec.h
@@ -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>
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index 7b034a4..8ade617 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -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>
diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
index 942a086..14fd6fd 100644
--- a/arch/x86/include/asm/ptrace.h
+++ b/arch/x86/include/asm/ptrace.h
@@ -60,7 +60,6 @@ struct pt_regs {
#endif /* !__i386__ */
-#include <linux/init.h>
#ifdef CONFIG_PARAVIRT
#include <asm/paravirt_types.h>
#endif
diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
index 4137890..8cd27e0 100644
--- a/arch/x86/include/asm/smp.h
+++ b/arch/x86/include/asm/smp.h
@@ -2,7 +2,6 @@
#define _ASM_X86_SMP_H
#ifndef __ASSEMBLY__
#include <linux/cpumask.h>
-#include <linux/init.h>
#include <asm/percpu.h>
/*
diff --git a/arch/x86/include/asm/timer.h b/arch/x86/include/asm/timer.h
index 34baa0e..a6f3e77 100644
--- a/arch/x86/include/asm/timer.h
+++ b/arch/x86/include/asm/timer.h
@@ -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>
diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
index 00c77cf..5d5b9eb 100644
--- a/arch/x86/kernel/apic/apic_flat_64.c
+++ b/arch/x86/kernel/apic/apic_flat_64.c
@@ -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>
diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
index e145f28..191ce75 100644
--- a/arch/x86/kernel/apic/apic_noop.c
+++ b/arch/x86/kernel/apic/apic_noop.c
@@ -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>
diff --git a/arch/x86/kernel/apic/ipi.c b/arch/x86/kernel/apic/ipi.c
index 7434d85..6207156 100644
--- a/arch/x86/kernel/apic/ipi.c
+++ b/arch/x86/kernel/apic/ipi.c
@@ -1,6 +1,5 @@
#include <linux/cpumask.h>
#include <linux/interrupt.h>
-#include <linux/init.h>
#include <linux/mm.h>
#include <linux/delay.h>
diff --git a/arch/x86/kernel/apic/summit_32.c b/arch/x86/kernel/apic/summit_32.c
index 77c95c0..00146f9 100644
--- a/arch/x86/kernel/apic/summit_32.c
+++ b/arch/x86/kernel/apic/summit_32.c
@@ -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>
diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
index 140e29d..cac85ee 100644
--- a/arch/x86/kernel/apic/x2apic_cluster.c
+++ b/arch/x86/kernel/apic/x2apic_cluster.c
@@ -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>
diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
index 562a76d..de231e3 100644
--- a/arch/x86/kernel/apic/x2apic_phys.c
+++ b/arch/x86/kernel/apic/x2apic_phys.c
@@ -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>
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index bca023b..39bc78d 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -1,5 +1,4 @@
#include <linux/export.h>
-#include <linux/init.h>
#include <linux/bitops.h>
#include <linux/elf.h>
#include <linux/mm.h>
diff --git a/arch/x86/kernel/cpu/centaur.c b/arch/x86/kernel/cpu/centaur.c
index 8d5652d..8779eda 100644
--- a/arch/x86/kernel/cpu/centaur.c
+++ b/arch/x86/kernel/cpu/centaur.c
@@ -1,6 +1,5 @@
#include <linux/bitops.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <asm/processor.h>
#include <asm/e820.h>
diff --git a/arch/x86/kernel/cpu/cyrix.c b/arch/x86/kernel/cpu/cyrix.c
index d0969c7..aaf152e 100644
--- a/arch/x86/kernel/cpu/cyrix.c
+++ b/arch/x86/kernel/cpu/cyrix.c
@@ -1,4 +1,3 @@
-#include <linux/init.h>
#include <linux/bitops.h>
#include <linux/delay.h>
#include <linux/pci.h>
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index dc1ec0d..53f5d3c 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -1,4 +1,3 @@
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/string.h>
diff --git a/arch/x86/kernel/cpu/mcheck/mce_intel.c b/arch/x86/kernel/cpu/mcheck/mce_intel.c
index 4cfe045..fb6156f 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_intel.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_intel.c
@@ -6,7 +6,6 @@
*/
#include <linux/gfp.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/percpu.h>
#include <linux/sched.h>
diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
index 1c044b1..a304298 100644
--- a/arch/x86/kernel/cpu/mcheck/p5.c
+++ b/arch/x86/kernel/cpu/mcheck/p5.c
@@ -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>
diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
index e9a701a..7dc5564 100644
--- a/arch/x86/kernel/cpu/mcheck/winchip.c
+++ b/arch/x86/kernel/cpu/mcheck/winchip.c
@@ -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>
diff --git a/arch/x86/kernel/cpu/transmeta.c b/arch/x86/kernel/cpu/transmeta.c
index aa0430d..3fa0e5a 100644
--- a/arch/x86/kernel/cpu/transmeta.c
+++ b/arch/x86/kernel/cpu/transmeta.c
@@ -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"
diff --git a/arch/x86/kernel/cpu/umc.c b/arch/x86/kernel/cpu/umc.c
index 75c5ad5..ef9c2a0 100644
--- a/arch/x86/kernel/cpu/umc.c
+++ b/arch/x86/kernel/cpu/umc.c
@@ -1,5 +1,4 @@
#include <linux/kernel.h>
-#include <linux/init.h>
#include <asm/processor.h>
#include "cpu.h"
diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
index 18677a9..a57902e 100644
--- a/arch/x86/kernel/crash.c
+++ b/arch/x86/kernel/crash.c
@@ -7,7 +7,6 @@
*
*/
-#include <linux/init.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/smp.h>
diff --git a/arch/x86/kernel/doublefault.c b/arch/x86/kernel/doublefault.c
index 5d3fe8d..f6dfd93 100644
--- a/arch/x86/kernel/doublefault.c
+++ b/arch/x86/kernel/doublefault.c
@@ -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>
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index 81ba276..d18be9c 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -8,7 +8,6 @@
.text
#include <linux/threads.h>
-#include <linux/init.h>
#include <linux/linkage.h>
#include <asm/segment.h>
#include <asm/page_types.h>
diff --git a/arch/x86/kernel/hw_breakpoint.c b/arch/x86/kernel/hw_breakpoint.c
index f66ff16..a67b47c 100644
--- a/arch/x86/kernel/hw_breakpoint.c
+++ b/arch/x86/kernel/hw_breakpoint.c
@@ -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>
diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
index 836f832..7ec1d5f 100644
--- a/arch/x86/kernel/kgdb.c
+++ b/arch/x86/kernel/kgdb.c
@@ -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>
diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
index 5b19e4d..1667b1d 100644
--- a/arch/x86/kernel/machine_kexec_32.c
+++ b/arch/x86/kernel/machine_kexec_32.c
@@ -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>
diff --git a/arch/x86/kernel/pci-nommu.c b/arch/x86/kernel/pci-nommu.c
index 871be4a..da15918 100644
--- a/arch/x86/kernel/pci-nommu.c
+++ b/arch/x86/kernel/pci-nommu.c
@@ -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>
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
index 6f1236c..0de43e9 100644
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@ -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>
diff --git a/arch/x86/kernel/tsc_sync.c b/arch/x86/kernel/tsc_sync.c
index adfdf56..2648848 100644
--- a/arch/x86/kernel/tsc_sync.c
+++ b/arch/x86/kernel/tsc_sync.c
@@ -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>
diff --git a/arch/x86/lib/delay.c b/arch/x86/lib/delay.c
index 7c3bee6..39d6a3d 100644
--- a/arch/x86/lib/delay.c
+++ b/arch/x86/lib/delay.c
@@ -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>
diff --git a/arch/x86/mm/kmmio.c b/arch/x86/mm/kmmio.c
index e5d5e2c..637ab34 100644
--- a/arch/x86/mm/kmmio.c
+++ b/arch/x86/mm/kmmio.c
@@ -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>
diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c
index d0b1773..461bc82 100644
--- a/arch/x86/mm/pageattr-test.c
+++ b/arch/x86/mm/pageattr-test.c
@@ -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>
diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c
index b046e07..bca9e85 100644
--- a/arch/x86/pci/fixup.c
+++ b/arch/x86/pci/fixup.c
@@ -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>
diff --git a/arch/x86/platform/intel-mid/early_printk_intel_mid.c b/arch/x86/platform/intel-mid/early_printk_intel_mid.c
index 4f702f5..e0bd082 100644
--- a/arch/x86/platform/intel-mid/early_printk_intel_mid.c
+++ b/arch/x86/platform/intel-mid/early_printk_intel_mid.c
@@ -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>
diff --git a/arch/x86/platform/iris/iris.c b/arch/x86/platform/iris/iris.c
index e6cb80f..4d171e8 100644
--- a/arch/x86/platform/iris/iris.c
+++ b/arch/x86/platform/iris/iris.c
@@ -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>
diff --git a/arch/x86/realmode/rm/reboot.S b/arch/x86/realmode/rm/reboot.S
index f932ea6..d66c607 100644
--- a/arch/x86/realmode/rm/reboot.S
+++ b/arch/x86/realmode/rm/reboot.S
@@ -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>
diff --git a/arch/x86/realmode/rm/trampoline_32.S b/arch/x86/realmode/rm/trampoline_32.S
index c1b2791..48ddd76 100644
--- a/arch/x86/realmode/rm/trampoline_32.S
+++ b/arch/x86/realmode/rm/trampoline_32.S
@@ -20,7 +20,6 @@
*/
#include <linux/linkage.h>
-#include <linux/init.h>
#include <asm/segment.h>
#include <asm/page_types.h>
#include "realmode.h"
diff --git a/arch/x86/realmode/rm/trampoline_64.S b/arch/x86/realmode/rm/trampoline_64.S
index bb360dc..dac7b20 100644
--- a/arch/x86/realmode/rm/trampoline_64.S
+++ b/arch/x86/realmode/rm/trampoline_64.S
@@ -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>
diff --git a/arch/x86/um/vdso/vdso.S b/arch/x86/um/vdso/vdso.S
index 1cb468a..4b4bd4c 100644
--- a/arch/x86/um/vdso/vdso.S
+++ b/arch/x86/um/vdso/vdso.S
@@ -1,4 +1,3 @@
-#include <linux/init.h>
__INITDATA
diff --git a/arch/x86/vdso/vdso.S b/arch/x86/vdso/vdso.S
index 01f5e3b..1e13eb8 100644
--- a/arch/x86/vdso/vdso.S
+++ b/arch/x86/vdso/vdso.S
@@ -1,6 +1,5 @@
#include <asm/page_types.h>
#include <linux/linkage.h>
-#include <linux/init.h>
__PAGE_ALIGNED_DATA
diff --git a/arch/x86/vdso/vdsox32.S b/arch/x86/vdso/vdsox32.S
index d6b9a7f..295f1c7 100644
--- a/arch/x86/vdso/vdsox32.S
+++ b/arch/x86/vdso/vdsox32.S
@@ -1,6 +1,5 @@
#include <asm/page_types.h>
#include <linux/linkage.h>
-#include <linux/init.h>
__PAGE_ALIGNED_DATA
^ permalink raw reply related [flat|nested] 17+ messages in thread* Re: [PATCH] x86: delete non-required instances of include <linux/init.h>
2014-01-07 0:20 [PATCH] x86: delete non-required instances of include <linux/init.h> Paul Gortmaker
2014-01-07 5:15 ` [tip:x86/cleanups] x86: Delete " tip-bot for Paul Gortmaker
@ 2014-01-07 5:22 ` H. Peter Anvin
2014-01-07 14:26 ` Paul Gortmaker
2014-01-07 5:27 ` [tip:x86/cleanups] x86: Delete " tip-bot for Paul Gortmaker
2 siblings, 1 reply; 17+ messages in thread
From: H. Peter Anvin @ 2014-01-07 5:22 UTC (permalink / raw)
To: Paul Gortmaker, x86; +Cc: linux-kernel
On 01/06/2014 04:20 PM, Paul Gortmaker wrote:
> None of these files are actually using any __init type directives
> and hence don't need to include <linux/init.h>. Most are just a
> left over from __devinit and __cpuinit removal, or simply due to
> code getting copied from one driver to the next.
>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> ---
>
> [build tested allyes/modconfig on x86/build from today's tip tree]
>
Did you remember to test both 32 and 64 bits? I'm assuming not, since
head_32.S no longer builds:
/home/hpa/kernel/tip.x86-cleanups/arch/x86/kernel/head_32.S: Assembler
messages:
/home/hpa/kernel/tip.x86-cleanups/arch/x86/kernel/head_32.S:86: Error:
no such instruction: `__head'
/home/hpa/kernel/tip.x86-cleanups/arch/x86/kernel/head_32.S:476: Error:
no such instruction: `__init'
/home/hpa/kernel/tip.x86-cleanups/arch/x86/kernel/head_32.S:635: Error:
no such instruction: `__initdata'
/home/hpa/kernel/tip.x86-cleanups/arch/x86/kernel/head_32.S:640: Error:
no such instruction: `__refdata'
/home/hpa/kernel/tip.x86-cleanups/arch/x86/kernel/head_32.S:698: Error:
no such instruction: `__initrodata'
make[4]: *** [arch/x86/kernel/head_32.o] Error 1
-hpa
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH] x86: delete non-required instances of include <linux/init.h>
2014-01-07 5:22 ` [PATCH] x86: delete " H. Peter Anvin
@ 2014-01-07 14:26 ` Paul Gortmaker
0 siblings, 0 replies; 17+ messages in thread
From: Paul Gortmaker @ 2014-01-07 14:26 UTC (permalink / raw)
To: H. Peter Anvin, x86; +Cc: linux-kernel
On 14-01-07 12:22 AM, H. Peter Anvin wrote:
> On 01/06/2014 04:20 PM, Paul Gortmaker wrote:
>> None of these files are actually using any __init type directives
>> and hence don't need to include <linux/init.h>. Most are just a
>> left over from __devinit and __cpuinit removal, or simply due to
>> code getting copied from one driver to the next.
>>
>> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
>> ---
>>
>> [build tested allyes/modconfig on x86/build from today's tip tree]
>>
>
> Did you remember to test both 32 and 64 bits? I'm assuming not, since
> head_32.S no longer builds:
Ah crap, knew I was forgetting something. Will retest and resend; sorry
for the wasted cycles.
P.
--
>
> /home/hpa/kernel/tip.x86-cleanups/arch/x86/kernel/head_32.S: Assembler
> messages:
> /home/hpa/kernel/tip.x86-cleanups/arch/x86/kernel/head_32.S:86: Error:
> no such instruction: `__head'
> /home/hpa/kernel/tip.x86-cleanups/arch/x86/kernel/head_32.S:476: Error:
> no such instruction: `__init'
> /home/hpa/kernel/tip.x86-cleanups/arch/x86/kernel/head_32.S:635: Error:
> no such instruction: `__initdata'
> /home/hpa/kernel/tip.x86-cleanups/arch/x86/kernel/head_32.S:640: Error:
> no such instruction: `__refdata'
> /home/hpa/kernel/tip.x86-cleanups/arch/x86/kernel/head_32.S:698: Error:
> no such instruction: `__initrodata'
> make[4]: *** [arch/x86/kernel/head_32.o] Error 1
>
> -hpa
>
^ permalink raw reply [flat|nested] 17+ messages in thread
* [tip:x86/cleanups] x86: Delete non-required instances of include <linux/init.h>
2014-01-07 0:20 [PATCH] x86: delete non-required instances of include <linux/init.h> Paul Gortmaker
2014-01-07 5:15 ` [tip:x86/cleanups] x86: Delete " tip-bot for Paul Gortmaker
2014-01-07 5:22 ` [PATCH] x86: delete " H. Peter Anvin
@ 2014-01-07 5:27 ` tip-bot for Paul Gortmaker
2014-01-12 12:03 ` Ingo Molnar
2 siblings, 1 reply; 17+ messages in thread
From: tip-bot for Paul Gortmaker @ 2014-01-07 5:27 UTC (permalink / raw)
To: linux-tip-commits; +Cc: linux-kernel, hpa, mingo, tglx, paul.gortmaker
Commit-ID: 663b55b9b39fa9c848cca273ca4e12bf29b32c71
Gitweb: http://git.kernel.org/tip/663b55b9b39fa9c848cca273ca4e12bf29b32c71
Author: Paul Gortmaker <paul.gortmaker@windriver.com>
AuthorDate: Mon, 6 Jan 2014 19:20:26 -0500
Committer: H. Peter Anvin <hpa@zytor.com>
CommitDate: Mon, 6 Jan 2014 21:25:18 -0800
x86: Delete non-required instances of include <linux/init.h>
None of these files are actually using any __init type directives
and hence don't need to include <linux/init.h>. Most are just a
left over from __devinit and __cpuinit removal, or simply due to
code getting copied from one driver to the next.
[ hpa: undid incorrect removal from arch/x86/kernel/head_32.S ]
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Link: http://lkml.kernel.org/r/1389054026-12947-1-git-send-email-paul.gortmaker@windriver.com
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---
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 | 1 -
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/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 -
arch/x86/platform/intel-mid/early_printk_intel_mid.c | 1 -
arch/x86/platform/iris/iris.c | 1 -
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/um/vdso/vdso.S | 1 -
arch/x86/vdso/vdso.S | 1 -
arch/x86/vdso/vdsox32.S | 1 -
41 files changed, 41 deletions(-)
diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h
index c696a86..6e4ce2d 100644
--- a/arch/x86/include/asm/mce.h
+++ b/arch/x86/include/asm/mce.h
@@ -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;
diff --git a/arch/x86/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h
index 3142a94..3e6b492 100644
--- a/arch/x86/include/asm/mpspec.h
+++ b/arch/x86/include/asm/mpspec.h
@@ -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>
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index 7b034a4..8ade617 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -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>
diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
index 942a086..14fd6fd 100644
--- a/arch/x86/include/asm/ptrace.h
+++ b/arch/x86/include/asm/ptrace.h
@@ -60,7 +60,6 @@ struct pt_regs {
#endif /* !__i386__ */
-#include <linux/init.h>
#ifdef CONFIG_PARAVIRT
#include <asm/paravirt_types.h>
#endif
diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
index 4137890..8cd27e0 100644
--- a/arch/x86/include/asm/smp.h
+++ b/arch/x86/include/asm/smp.h
@@ -2,7 +2,6 @@
#define _ASM_X86_SMP_H
#ifndef __ASSEMBLY__
#include <linux/cpumask.h>
-#include <linux/init.h>
#include <asm/percpu.h>
/*
diff --git a/arch/x86/include/asm/timer.h b/arch/x86/include/asm/timer.h
index 34baa0e..a6f3e77 100644
--- a/arch/x86/include/asm/timer.h
+++ b/arch/x86/include/asm/timer.h
@@ -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>
diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
index 00c77cf..5d5b9eb 100644
--- a/arch/x86/kernel/apic/apic_flat_64.c
+++ b/arch/x86/kernel/apic/apic_flat_64.c
@@ -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>
diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
index e145f28..191ce75 100644
--- a/arch/x86/kernel/apic/apic_noop.c
+++ b/arch/x86/kernel/apic/apic_noop.c
@@ -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>
diff --git a/arch/x86/kernel/apic/ipi.c b/arch/x86/kernel/apic/ipi.c
index 7434d85..6207156 100644
--- a/arch/x86/kernel/apic/ipi.c
+++ b/arch/x86/kernel/apic/ipi.c
@@ -1,6 +1,5 @@
#include <linux/cpumask.h>
#include <linux/interrupt.h>
-#include <linux/init.h>
#include <linux/mm.h>
#include <linux/delay.h>
diff --git a/arch/x86/kernel/apic/summit_32.c b/arch/x86/kernel/apic/summit_32.c
index 77c95c0..00146f9 100644
--- a/arch/x86/kernel/apic/summit_32.c
+++ b/arch/x86/kernel/apic/summit_32.c
@@ -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>
diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
index 140e29d..cac85ee 100644
--- a/arch/x86/kernel/apic/x2apic_cluster.c
+++ b/arch/x86/kernel/apic/x2apic_cluster.c
@@ -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>
diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
index 562a76d..de231e3 100644
--- a/arch/x86/kernel/apic/x2apic_phys.c
+++ b/arch/x86/kernel/apic/x2apic_phys.c
@@ -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>
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index bca023b..39bc78d 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -1,5 +1,4 @@
#include <linux/export.h>
-#include <linux/init.h>
#include <linux/bitops.h>
#include <linux/elf.h>
#include <linux/mm.h>
diff --git a/arch/x86/kernel/cpu/centaur.c b/arch/x86/kernel/cpu/centaur.c
index 8d5652d..8779eda 100644
--- a/arch/x86/kernel/cpu/centaur.c
+++ b/arch/x86/kernel/cpu/centaur.c
@@ -1,6 +1,5 @@
#include <linux/bitops.h>
#include <linux/kernel.h>
-#include <linux/init.h>
#include <asm/processor.h>
#include <asm/e820.h>
diff --git a/arch/x86/kernel/cpu/cyrix.c b/arch/x86/kernel/cpu/cyrix.c
index d0969c7..aaf152e 100644
--- a/arch/x86/kernel/cpu/cyrix.c
+++ b/arch/x86/kernel/cpu/cyrix.c
@@ -1,4 +1,3 @@
-#include <linux/init.h>
#include <linux/bitops.h>
#include <linux/delay.h>
#include <linux/pci.h>
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index dc1ec0d..53f5d3c 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -1,4 +1,3 @@
-#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/string.h>
diff --git a/arch/x86/kernel/cpu/mcheck/mce_intel.c b/arch/x86/kernel/cpu/mcheck/mce_intel.c
index 4cfe045..fb6156f 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_intel.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_intel.c
@@ -6,7 +6,6 @@
*/
#include <linux/gfp.h>
-#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/percpu.h>
#include <linux/sched.h>
diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
index 1c044b1..a304298 100644
--- a/arch/x86/kernel/cpu/mcheck/p5.c
+++ b/arch/x86/kernel/cpu/mcheck/p5.c
@@ -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>
diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
index e9a701a..7dc5564 100644
--- a/arch/x86/kernel/cpu/mcheck/winchip.c
+++ b/arch/x86/kernel/cpu/mcheck/winchip.c
@@ -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>
diff --git a/arch/x86/kernel/cpu/transmeta.c b/arch/x86/kernel/cpu/transmeta.c
index aa0430d..3fa0e5a 100644
--- a/arch/x86/kernel/cpu/transmeta.c
+++ b/arch/x86/kernel/cpu/transmeta.c
@@ -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"
diff --git a/arch/x86/kernel/cpu/umc.c b/arch/x86/kernel/cpu/umc.c
index 75c5ad5..ef9c2a0 100644
--- a/arch/x86/kernel/cpu/umc.c
+++ b/arch/x86/kernel/cpu/umc.c
@@ -1,5 +1,4 @@
#include <linux/kernel.h>
-#include <linux/init.h>
#include <asm/processor.h>
#include "cpu.h"
diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
index 18677a9..a57902e 100644
--- a/arch/x86/kernel/crash.c
+++ b/arch/x86/kernel/crash.c
@@ -7,7 +7,6 @@
*
*/
-#include <linux/init.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/smp.h>
diff --git a/arch/x86/kernel/doublefault.c b/arch/x86/kernel/doublefault.c
index 5d3fe8d..f6dfd93 100644
--- a/arch/x86/kernel/doublefault.c
+++ b/arch/x86/kernel/doublefault.c
@@ -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>
diff --git a/arch/x86/kernel/hw_breakpoint.c b/arch/x86/kernel/hw_breakpoint.c
index f66ff16..a67b47c 100644
--- a/arch/x86/kernel/hw_breakpoint.c
+++ b/arch/x86/kernel/hw_breakpoint.c
@@ -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>
diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
index 836f832..7ec1d5f 100644
--- a/arch/x86/kernel/kgdb.c
+++ b/arch/x86/kernel/kgdb.c
@@ -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>
diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
index 5b19e4d..1667b1d 100644
--- a/arch/x86/kernel/machine_kexec_32.c
+++ b/arch/x86/kernel/machine_kexec_32.c
@@ -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>
diff --git a/arch/x86/kernel/pci-nommu.c b/arch/x86/kernel/pci-nommu.c
index 871be4a..da15918 100644
--- a/arch/x86/kernel/pci-nommu.c
+++ b/arch/x86/kernel/pci-nommu.c
@@ -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>
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
index 6f1236c..0de43e9 100644
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@ -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>
diff --git a/arch/x86/kernel/tsc_sync.c b/arch/x86/kernel/tsc_sync.c
index adfdf56..2648848 100644
--- a/arch/x86/kernel/tsc_sync.c
+++ b/arch/x86/kernel/tsc_sync.c
@@ -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>
diff --git a/arch/x86/lib/delay.c b/arch/x86/lib/delay.c
index 7c3bee6..39d6a3d 100644
--- a/arch/x86/lib/delay.c
+++ b/arch/x86/lib/delay.c
@@ -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>
diff --git a/arch/x86/mm/kmmio.c b/arch/x86/mm/kmmio.c
index e5d5e2c..637ab34 100644
--- a/arch/x86/mm/kmmio.c
+++ b/arch/x86/mm/kmmio.c
@@ -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>
diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c
index d0b1773..461bc82 100644
--- a/arch/x86/mm/pageattr-test.c
+++ b/arch/x86/mm/pageattr-test.c
@@ -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>
diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c
index b046e07..bca9e85 100644
--- a/arch/x86/pci/fixup.c
+++ b/arch/x86/pci/fixup.c
@@ -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>
diff --git a/arch/x86/platform/intel-mid/early_printk_intel_mid.c b/arch/x86/platform/intel-mid/early_printk_intel_mid.c
index 4f702f5..e0bd082 100644
--- a/arch/x86/platform/intel-mid/early_printk_intel_mid.c
+++ b/arch/x86/platform/intel-mid/early_printk_intel_mid.c
@@ -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>
diff --git a/arch/x86/platform/iris/iris.c b/arch/x86/platform/iris/iris.c
index e6cb80f..4d171e8 100644
--- a/arch/x86/platform/iris/iris.c
+++ b/arch/x86/platform/iris/iris.c
@@ -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>
diff --git a/arch/x86/realmode/rm/reboot.S b/arch/x86/realmode/rm/reboot.S
index f932ea6..d66c607 100644
--- a/arch/x86/realmode/rm/reboot.S
+++ b/arch/x86/realmode/rm/reboot.S
@@ -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>
diff --git a/arch/x86/realmode/rm/trampoline_32.S b/arch/x86/realmode/rm/trampoline_32.S
index c1b2791..48ddd76 100644
--- a/arch/x86/realmode/rm/trampoline_32.S
+++ b/arch/x86/realmode/rm/trampoline_32.S
@@ -20,7 +20,6 @@
*/
#include <linux/linkage.h>
-#include <linux/init.h>
#include <asm/segment.h>
#include <asm/page_types.h>
#include "realmode.h"
diff --git a/arch/x86/realmode/rm/trampoline_64.S b/arch/x86/realmode/rm/trampoline_64.S
index bb360dc..dac7b20 100644
--- a/arch/x86/realmode/rm/trampoline_64.S
+++ b/arch/x86/realmode/rm/trampoline_64.S
@@ -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>
diff --git a/arch/x86/um/vdso/vdso.S b/arch/x86/um/vdso/vdso.S
index 1cb468a..4b4bd4c 100644
--- a/arch/x86/um/vdso/vdso.S
+++ b/arch/x86/um/vdso/vdso.S
@@ -1,4 +1,3 @@
-#include <linux/init.h>
__INITDATA
diff --git a/arch/x86/vdso/vdso.S b/arch/x86/vdso/vdso.S
index 01f5e3b..1e13eb8 100644
--- a/arch/x86/vdso/vdso.S
+++ b/arch/x86/vdso/vdso.S
@@ -1,6 +1,5 @@
#include <asm/page_types.h>
#include <linux/linkage.h>
-#include <linux/init.h>
__PAGE_ALIGNED_DATA
diff --git a/arch/x86/vdso/vdsox32.S b/arch/x86/vdso/vdsox32.S
index d6b9a7f..295f1c7 100644
--- a/arch/x86/vdso/vdsox32.S
+++ b/arch/x86/vdso/vdsox32.S
@@ -1,6 +1,5 @@
#include <asm/page_types.h>
#include <linux/linkage.h>
-#include <linux/init.h>
__PAGE_ALIGNED_DATA
^ permalink raw reply related [flat|nested] 17+ messages in thread* Re: [tip:x86/cleanups] x86: Delete non-required instances of include <linux/init.h>
2014-01-07 5:27 ` [tip:x86/cleanups] x86: Delete " tip-bot for Paul Gortmaker
@ 2014-01-12 12:03 ` Ingo Molnar
2014-01-12 14:22 ` Richard Weinberger
2014-01-12 14:52 ` [uml-devel] [PATCH] um, x86: Fix vDSO build Richard Weinberger
0 siblings, 2 replies; 17+ messages in thread
From: Ingo Molnar @ 2014-01-12 12:03 UTC (permalink / raw)
To: hpa, linux-kernel, tglx, paul.gortmaker; +Cc: linux-tip-commits
* tip-bot for Paul Gortmaker <tipbot@zytor.com> wrote:
> Commit-ID: 663b55b9b39fa9c848cca273ca4e12bf29b32c71
> Gitweb: http://git.kernel.org/tip/663b55b9b39fa9c848cca273ca4e12bf29b32c71
> Author: Paul Gortmaker <paul.gortmaker@windriver.com>
> AuthorDate: Mon, 6 Jan 2014 19:20:26 -0500
> Committer: H. Peter Anvin <hpa@zytor.com>
> CommitDate: Mon, 6 Jan 2014 21:25:18 -0800
>
> x86: Delete non-required instances of include <linux/init.h>
>
> None of these files are actually using any __init type directives
> and hence don't need to include <linux/init.h>. Most are just a
> left over from __devinit and __cpuinit removal, or simply due to
> code getting copied from one driver to the next.
>
> [ hpa: undid incorrect removal from arch/x86/kernel/head_32.S ]
>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> Link: http://lkml.kernel.org/r/1389054026-12947-1-git-send-email-paul.gortmaker@windriver.com
> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
FYI, this patch breaks the UML build:
/home/mingo/tip/arch/x86/um/vdso/vdso.S: Assembler messages:
/home/mingo/tip/arch/x86/um/vdso/vdso.S:2: Error: no such instruction: `__initdata'
/home/mingo/tip/arch/x86/um/vdso/vdso.S:9: Error: no such instruction: `__finit'
Thanks,
Ingo
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [tip:x86/cleanups] x86: Delete non-required instances of include <linux/init.h>
2014-01-12 12:03 ` Ingo Molnar
@ 2014-01-12 14:22 ` Richard Weinberger
2014-01-12 14:52 ` [uml-devel] [PATCH] um, x86: Fix vDSO build Richard Weinberger
1 sibling, 0 replies; 17+ messages in thread
From: Richard Weinberger @ 2014-01-12 14:22 UTC (permalink / raw)
To: Ingo Molnar
Cc: H. Peter Anvin, LKML, Thomas Gleixner, paul.gortmaker,
linux-tip-commits
On Sun, Jan 12, 2014 at 1:03 PM, Ingo Molnar <mingo@kernel.org> wrote:
>
> * tip-bot for Paul Gortmaker <tipbot@zytor.com> wrote:
>
>> Commit-ID: 663b55b9b39fa9c848cca273ca4e12bf29b32c71
>> Gitweb: http://git.kernel.org/tip/663b55b9b39fa9c848cca273ca4e12bf29b32c71
>> Author: Paul Gortmaker <paul.gortmaker@windriver.com>
>> AuthorDate: Mon, 6 Jan 2014 19:20:26 -0500
>> Committer: H. Peter Anvin <hpa@zytor.com>
>> CommitDate: Mon, 6 Jan 2014 21:25:18 -0800
>>
>> x86: Delete non-required instances of include <linux/init.h>
>>
>> None of these files are actually using any __init type directives
>> and hence don't need to include <linux/init.h>. Most are just a
>> left over from __devinit and __cpuinit removal, or simply due to
>> code getting copied from one driver to the next.
>>
>> [ hpa: undid incorrect removal from arch/x86/kernel/head_32.S ]
>>
>> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
>> Link: http://lkml.kernel.org/r/1389054026-12947-1-git-send-email-paul.gortmaker@windriver.com
>> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
>
> FYI, this patch breaks the UML build:
>
> /home/mingo/tip/arch/x86/um/vdso/vdso.S: Assembler messages:
> /home/mingo/tip/arch/x86/um/vdso/vdso.S:2: Error: no such instruction: `__initdata'
> /home/mingo/tip/arch/x86/um/vdso/vdso.S:9: Error: no such instruction: `__finit'
Thanks for reporting this Ingo!
Feel free to CC me in future too. :)
UML's vdso fails to build because it uses __INITDATA and __FINIT.
Paul, please remove that hunk from your patch.
diff --git a/arch/x86/um/vdso/vdso.S b/arch/x86/um/vdso/vdso.S
index 1cb468a..4b4bd4c 100644
--- a/arch/x86/um/vdso/vdso.S
+++ b/arch/x86/um/vdso/vdso.S
@@ -1,4 +1,3 @@
-#include <linux/init.h>
__INITDATA
--
Thanks,
//richard
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [uml-devel] [PATCH] um, x86: Fix vDSO build
2014-01-12 12:03 ` Ingo Molnar
2014-01-12 14:22 ` Richard Weinberger
@ 2014-01-12 14:52 ` Richard Weinberger
2014-01-12 17:02 ` H. Peter Anvin
` (3 more replies)
1 sibling, 4 replies; 17+ messages in thread
From: Richard Weinberger @ 2014-01-12 14:52 UTC (permalink / raw)
To: mingo
Cc: user-mode-linux-devel, linux-tip-commits, Richard Weinberger,
paul.gortmaker, hpa, tglx
Commit "x86: Delete non-required instances of include <linux/init.h>"
broke the UML build.
arch/x86/um/vdso/vdso.S: Assembler messages:
arch/x86/um/vdso/vdso.S:2: Error: no such instruction: `__initdata'
arch/x86/um/vdso/vdso.S:9: Error: no such instruction: `__finit'
UML's vDSO needs linux/init.h.
Signed-off-by: Richard Weinberger <richard@nod.at>
---
arch/x86/um/vdso/vdso.S | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/x86/um/vdso/vdso.S b/arch/x86/um/vdso/vdso.S
index 4b4bd4c..1cb468a 100644
--- a/arch/x86/um/vdso/vdso.S
+++ b/arch/x86/um/vdso/vdso.S
@@ -1,3 +1,4 @@
+#include <linux/init.h>
__INITDATA
--
1.8.1.4
------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today.
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
^ permalink raw reply related [flat|nested] 17+ messages in thread* Re: [uml-devel] [PATCH] um, x86: Fix vDSO build
2014-01-12 14:52 ` [uml-devel] [PATCH] um, x86: Fix vDSO build Richard Weinberger
@ 2014-01-12 17:02 ` H. Peter Anvin
2014-01-12 17:17 ` Richard Weinberger
2014-01-13 12:50 ` Fengguang Wu
2014-01-12 17:10 ` [tip:x86/cleanups] " tip-bot for Richard Weinberger
` (2 subsequent siblings)
3 siblings, 2 replies; 17+ messages in thread
From: H. Peter Anvin @ 2014-01-12 17:02 UTC (permalink / raw)
To: Richard Weinberger, mingo, Fengguang Wu
Cc: paul.gortmaker, tglx, user-mode-linux-devel, linux-tip-commits
On 01/12/2014 06:52 AM, Richard Weinberger wrote:
> Commit "x86: Delete non-required instances of include <linux/init.h>"
> broke the UML build.
>
> arch/x86/um/vdso/vdso.S: Assembler messages:
> arch/x86/um/vdso/vdso.S:2: Error: no such instruction: `__initdata'
> arch/x86/um/vdso/vdso.S:9: Error: no such instruction: `__finit'
>
> UML's vDSO needs linux/init.h.
>
> Signed-off-by: Richard Weinberger <richard@nod.at>
> ---
> arch/x86/um/vdso/vdso.S | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/x86/um/vdso/vdso.S b/arch/x86/um/vdso/vdso.S
> index 4b4bd4c..1cb468a 100644
> --- a/arch/x86/um/vdso/vdso.S
> +++ b/arch/x86/um/vdso/vdso.S
> @@ -1,3 +1,4 @@
> +#include <linux/init.h>
>
> __INITDATA
>
So more bits that got "cleaned up" but never actually tested. Sigh.
Fengguang, could we get UM builds added to the test robot?
-hpa
------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today.
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [uml-devel] [PATCH] um, x86: Fix vDSO build
2014-01-12 17:02 ` H. Peter Anvin
@ 2014-01-12 17:17 ` Richard Weinberger
2014-01-12 18:58 ` Geert Uytterhoeven
2014-01-13 12:50 ` Fengguang Wu
1 sibling, 1 reply; 17+ messages in thread
From: Richard Weinberger @ 2014-01-12 17:17 UTC (permalink / raw)
To: H. Peter Anvin
Cc: user-mode-linux-devel, linux-tip-commits, paul.gortmaker, mingo,
tglx, Fengguang Wu
Am Sonntag, 12. Januar 2014, 09:02:06 schrieb H. Peter Anvin:
> On 01/12/2014 06:52 AM, Richard Weinberger wrote:
> > Commit "x86: Delete non-required instances of include <linux/init.h>"
> > broke the UML build.
> >
> > arch/x86/um/vdso/vdso.S: Assembler messages:
> > arch/x86/um/vdso/vdso.S:2: Error: no such instruction: `__initdata'
> > arch/x86/um/vdso/vdso.S:9: Error: no such instruction: `__finit'
> >
> > UML's vDSO needs linux/init.h.
> >
> > Signed-off-by: Richard Weinberger <richard@nod.at>
> > ---
> >
> > arch/x86/um/vdso/vdso.S | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/arch/x86/um/vdso/vdso.S b/arch/x86/um/vdso/vdso.S
> > index 4b4bd4c..1cb468a 100644
> > --- a/arch/x86/um/vdso/vdso.S
> > +++ b/arch/x86/um/vdso/vdso.S
> > @@ -1,3 +1,4 @@
> > +#include <linux/init.h>
> >
> > __INITDATA
>
> So more bits that got "cleaned up" but never actually tested. Sigh.
>
> Fengguang, could we get UM builds added to the test robot?
Would be great!
Fengguang, please make sure that you build both UML/i386 and UML/x86_64.
i.e. make defconfig ARCH=um SUBARCH=i386 && make linux ARCH=um
and make defconfig ARCH=um SUBARCH=x86 && make linux ARCH=um
Thanks,
//richard
------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today.
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [uml-devel] [PATCH] um, x86: Fix vDSO build
2014-01-12 17:17 ` Richard Weinberger
@ 2014-01-12 18:58 ` Geert Uytterhoeven
2014-01-12 19:01 ` Richard Weinberger
0 siblings, 1 reply; 17+ messages in thread
From: Geert Uytterhoeven @ 2014-01-12 18:58 UTC (permalink / raw)
To: Richard Weinberger
Cc: H. Peter Anvin, uml-devel, linux-tip-commits, Paul Gortmaker,
Ingo Molnar, Thomas Gleixner, Fengguang Wu
On Sun, Jan 12, 2014 at 6:17 PM, Richard Weinberger <richard@nod.at> wrote:
> Fengguang, please make sure that you build both UML/i386 and UML/x86_64.
> i.e. make defconfig ARCH=um SUBARCH=i386 && make linux ARCH=um
> and make defconfig ARCH=um SUBARCH=x86 && make linux ARCH=um
x86 or x86_64?
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 17+ messages in thread* Re: [uml-devel] [PATCH] um, x86: Fix vDSO build
2014-01-12 18:58 ` Geert Uytterhoeven
@ 2014-01-12 19:01 ` Richard Weinberger
0 siblings, 0 replies; 17+ messages in thread
From: Richard Weinberger @ 2014-01-12 19:01 UTC (permalink / raw)
To: Geert Uytterhoeven
Cc: H. Peter Anvin, uml-devel, linux-tip-commits, Paul Gortmaker,
Ingo Molnar, Thomas Gleixner, Fengguang Wu
Am Sonntag, 12. Januar 2014, 19:58:06 schrieb Geert Uytterhoeven:
> On Sun, Jan 12, 2014 at 6:17 PM, Richard Weinberger <richard@nod.at> wrote:
> > Fengguang, please make sure that you build both UML/i386 and UML/x86_64.
> > i.e. make defconfig ARCH=um SUBARCH=i386 && make linux ARCH=um
> > and make defconfig ARCH=um SUBARCH=x86 && make linux ARCH=um
>
> x86 or x86_64?
Both x86 and x86_64 will create a CONFIG_64BIT=y .config.
Thanks,
//richard
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [uml-devel] [PATCH] um, x86: Fix vDSO build
2014-01-12 17:02 ` H. Peter Anvin
2014-01-12 17:17 ` Richard Weinberger
@ 2014-01-13 12:50 ` Fengguang Wu
2014-01-13 20:01 ` H. Peter Anvin
1 sibling, 1 reply; 17+ messages in thread
From: Fengguang Wu @ 2014-01-13 12:50 UTC (permalink / raw)
To: H. Peter Anvin
Cc: user-mode-linux-devel, linux-tip-commits, Richard Weinberger,
paul.gortmaker, mingo, tglx
> Fengguang, could we get UM builds added to the test robot?
Yes, sure. Just added UML i386/x86_64 to the build tests.
Thanks,
Fengguang
------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today.
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [uml-devel] [PATCH] um, x86: Fix vDSO build
2014-01-13 12:50 ` Fengguang Wu
@ 2014-01-13 20:01 ` H. Peter Anvin
0 siblings, 0 replies; 17+ messages in thread
From: H. Peter Anvin @ 2014-01-13 20:01 UTC (permalink / raw)
To: Fengguang Wu
Cc: user-mode-linux-devel, linux-tip-commits, Richard Weinberger,
paul.gortmaker, mingo, tglx
On 01/13/2014 04:50 AM, Fengguang Wu wrote:
>> Fengguang, could we get UM builds added to the test robot?
>
> Yes, sure. Just added UML i386/x86_64 to the build tests.
>
Thank you! That will be highly useful.
-hpa
------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today.
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
^ permalink raw reply [flat|nested] 17+ messages in thread
* [tip:x86/cleanups] um, x86: Fix vDSO build
2014-01-12 14:52 ` [uml-devel] [PATCH] um, x86: Fix vDSO build Richard Weinberger
2014-01-12 17:02 ` H. Peter Anvin
@ 2014-01-12 17:10 ` tip-bot for Richard Weinberger
2014-01-12 17:18 ` [uml-devel] [PATCH] " Paul Gortmaker
2014-01-12 17:45 ` [tip:x86/cleanups] " tip-bot for Richard Weinberger
3 siblings, 0 replies; 17+ messages in thread
From: tip-bot for Richard Weinberger @ 2014-01-12 17:10 UTC (permalink / raw)
To: linux-tip-commits; +Cc: linux-kernel, hpa, mingo, richard, tglx
Commit-ID: 4ba89f1b381a0adb6cbdfc31a4753c7db11e6ba5
Gitweb: http://git.kernel.org/tip/4ba89f1b381a0adb6cbdfc31a4753c7db11e6ba5
Author: Richard Weinberger <richard@nod.at>
AuthorDate: Sun, 12 Jan 2014 15:52:21 +0100
Committer: H. Peter Anvin <hpa@zytor.com>
CommitDate: Sun, 12 Jan 2014 09:06:03 -0800
um, x86: Fix vDSO build
Commit
663b55b9b39fa x86: Delete non-required instances of include <linux/init.h>
broke the UML build.
arch/x86/um/vdso/vdso.S: Assembler messages:
arch/x86/um/vdso/vdso.S:2: Error: no such instruction: `__initdata'
arch/x86/um/vdso/vdso.S:9: Error: no such instruction: `__finit'
UML's vDSO needs linux/init.h.
Signed-off-by: Richard Weinberger <richard@nod.at>
Link: http://lkml.kernel.org/r/1389538341-31383-1-git-send-email-richard@nod.at
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---
arch/x86/um/vdso/vdso.S | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/x86/um/vdso/vdso.S b/arch/x86/um/vdso/vdso.S
index 4b4bd4c..1cb468a 100644
--- a/arch/x86/um/vdso/vdso.S
+++ b/arch/x86/um/vdso/vdso.S
@@ -1,3 +1,4 @@
+#include <linux/init.h>
__INITDATA
^ permalink raw reply related [flat|nested] 17+ messages in thread* Re: [uml-devel] [PATCH] um, x86: Fix vDSO build
2014-01-12 14:52 ` [uml-devel] [PATCH] um, x86: Fix vDSO build Richard Weinberger
2014-01-12 17:02 ` H. Peter Anvin
2014-01-12 17:10 ` [tip:x86/cleanups] " tip-bot for Richard Weinberger
@ 2014-01-12 17:18 ` Paul Gortmaker
2014-01-12 17:45 ` [tip:x86/cleanups] " tip-bot for Richard Weinberger
3 siblings, 0 replies; 17+ messages in thread
From: Paul Gortmaker @ 2014-01-12 17:18 UTC (permalink / raw)
To: Richard Weinberger
Cc: linux-tip-commits, tglx, mingo, user-mode-linux-devel, hpa
[[PATCH] um, x86: Fix vDSO build] On 12/01/2014 (Sun 15:52) Richard Weinberger wrote:
> Commit "x86: Delete non-required instances of include <linux/init.h>"
> broke the UML build.
>
> arch/x86/um/vdso/vdso.S: Assembler messages:
> arch/x86/um/vdso/vdso.S:2: Error: no such instruction: `__initdata'
> arch/x86/um/vdso/vdso.S:9: Error: no such instruction: `__finit'
>
> UML's vDSO needs linux/init.h.
>
> Signed-off-by: Richard Weinberger <richard@nod.at>
Thanks Richard & Ingo. I did these cleanups last fall but never got
around to submitting them until now; I think the false positives for
removal crept in when I manually started the process, before realizing
the scale of it needed automatic selection/application and verification.
And without me doing uml testing, I never got a chance to see the
breakage and undo it. I'll definitely add uml to my regular testing.
I see hpa has already put this on x86/cleanups, but for the record:
Acked-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Thanks again and sorry for the inconvenience.
P.
--
> ---
> arch/x86/um/vdso/vdso.S | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/x86/um/vdso/vdso.S b/arch/x86/um/vdso/vdso.S
> index 4b4bd4c..1cb468a 100644
> --- a/arch/x86/um/vdso/vdso.S
> +++ b/arch/x86/um/vdso/vdso.S
> @@ -1,3 +1,4 @@
> +#include <linux/init.h>
>
> __INITDATA
>
> --
> 1.8.1.4
>
------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today.
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
^ permalink raw reply [flat|nested] 17+ messages in thread
* [tip:x86/cleanups] um, x86: Fix vDSO build
2014-01-12 14:52 ` [uml-devel] [PATCH] um, x86: Fix vDSO build Richard Weinberger
` (2 preceding siblings ...)
2014-01-12 17:18 ` [uml-devel] [PATCH] " Paul Gortmaker
@ 2014-01-12 17:45 ` tip-bot for Richard Weinberger
3 siblings, 0 replies; 17+ messages in thread
From: tip-bot for Richard Weinberger @ 2014-01-12 17:45 UTC (permalink / raw)
To: linux-tip-commits; +Cc: linux-kernel, hpa, mingo, richard, tglx
Commit-ID: 106553aa4ead528b1bab37fb3cc47004a4451acc
Gitweb: http://git.kernel.org/tip/106553aa4ead528b1bab37fb3cc47004a4451acc
Author: Richard Weinberger <richard@nod.at>
AuthorDate: Sun, 12 Jan 2014 15:52:21 +0100
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Sun, 12 Jan 2014 16:47:31 +0100
um, x86: Fix vDSO build
Commit 663b55b9b39 ("x86: Delete non-required instances of include <linux/init.h>")
broke the UML build.
arch/x86/um/vdso/vdso.S: Assembler messages:
arch/x86/um/vdso/vdso.S:2: Error: no such instruction: `__initdata'
arch/x86/um/vdso/vdso.S:9: Error: no such instruction: `__finit'
UML's vDSO needs linux/init.h.
Reported-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Richard Weinberger <richard@nod.at>
Cc: user-mode-linux-devel@lists.sourceforge.net
Cc: paul.gortmaker@windriver.com
Link: http://lkml.kernel.org/r/1389538341-31383-1-git-send-email-richard@nod.at
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/um/vdso/vdso.S | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/x86/um/vdso/vdso.S b/arch/x86/um/vdso/vdso.S
index 4b4bd4c..1cb468a 100644
--- a/arch/x86/um/vdso/vdso.S
+++ b/arch/x86/um/vdso/vdso.S
@@ -1,3 +1,4 @@
+#include <linux/init.h>
__INITDATA
^ permalink raw reply related [flat|nested] 17+ messages in thread
end of thread, other threads:[~2014-01-13 20:01 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-07 0:20 [PATCH] x86: delete non-required instances of include <linux/init.h> Paul Gortmaker
2014-01-07 5:15 ` [tip:x86/cleanups] x86: Delete " tip-bot for Paul Gortmaker
2014-01-07 5:22 ` [PATCH] x86: delete " H. Peter Anvin
2014-01-07 14:26 ` Paul Gortmaker
2014-01-07 5:27 ` [tip:x86/cleanups] x86: Delete " tip-bot for Paul Gortmaker
2014-01-12 12:03 ` Ingo Molnar
2014-01-12 14:22 ` Richard Weinberger
2014-01-12 14:52 ` [uml-devel] [PATCH] um, x86: Fix vDSO build Richard Weinberger
2014-01-12 17:02 ` H. Peter Anvin
2014-01-12 17:17 ` Richard Weinberger
2014-01-12 18:58 ` Geert Uytterhoeven
2014-01-12 19:01 ` Richard Weinberger
2014-01-13 12:50 ` Fengguang Wu
2014-01-13 20:01 ` H. Peter Anvin
2014-01-12 17:10 ` [tip:x86/cleanups] " tip-bot for Richard Weinberger
2014-01-12 17:18 ` [uml-devel] [PATCH] " Paul Gortmaker
2014-01-12 17:45 ` [tip:x86/cleanups] " tip-bot for Richard Weinberger
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.