x86: Don't include linux/irq.h from asm/hardirq.h
The next patch in this series will have to make the definition of irq_cpustat_t available to entering_irq(). Inclusion of asm/hardirq.h into asm/apic.h would cause circular header dependencies like asm/smp.h asm/apic.h asm/hardirq.h linux/irq.h linux/topology.h linux/smp.h asm/smp.h or linux/gfp.h linux/mmzone.h asm/mmzone.h asm/mmzone_64.h asm/smp.h asm/apic.h asm/hardirq.h linux/irq.h linux/irqdesc.h linux/kobject.h linux/sysfs.h linux/kernfs.h linux/idr.h linux/gfp.h and others. This causes compilation errors because of the header guards becoming effective in the second inclusion: symbols/macros that had been defined before wouldn't be available to intermediate headers in the #include chain anymore. A possible workaround would be to move the definition of irq_cpustat_t into its own header and include that from both, asm/hardirq.h and asm/apic.h. However, this wouldn't solve the real problem, namely asm/harirq.h unnecessarily pulling in all the linux/irq.h cruft: nothing in asm/hardirq.h itself requires it. Also, note that there are some other archs, like e.g. arm64, which don't have that #include in their asm/hardirq.h. Remove the linux/irq.h #include from x86' asm/hardirq.h. Fix resulting compilation errors by adding appropriate #includes to *.c files as needed. Note that some of these *.c files could be cleaned up a bit wrt. to their set of #includes, but that should better be done from separate patches, if at all. Signed-off-by:Nicolai Stange <nstange@suse.de> Signed-off-by:
Thomas Gleixner <tglx@linutronix.de>
Showing
- arch/x86/include/asm/dmi.h 1 addition, 1 deletionarch/x86/include/asm/dmi.h
- arch/x86/include/asm/hardirq.h 0 additions, 1 deletionarch/x86/include/asm/hardirq.h
- arch/x86/include/asm/kvm_host.h 1 addition, 0 deletionsarch/x86/include/asm/kvm_host.h
- arch/x86/kernel/apic/apic.c 1 addition, 0 deletionsarch/x86/kernel/apic/apic.c
- arch/x86/kernel/apic/io_apic.c 1 addition, 0 deletionsarch/x86/kernel/apic/io_apic.c
- arch/x86/kernel/apic/msi.c 1 addition, 0 deletionsarch/x86/kernel/apic/msi.c
- arch/x86/kernel/apic/vector.c 1 addition, 0 deletionsarch/x86/kernel/apic/vector.c
- arch/x86/kernel/fpu/core.c 1 addition, 0 deletionsarch/x86/kernel/fpu/core.c
- arch/x86/kernel/hpet.c 1 addition, 0 deletionsarch/x86/kernel/hpet.c
- arch/x86/kernel/i8259.c 1 addition, 0 deletionsarch/x86/kernel/i8259.c
- arch/x86/kernel/idt.c 1 addition, 0 deletionsarch/x86/kernel/idt.c
- arch/x86/kernel/irq.c 1 addition, 0 deletionsarch/x86/kernel/irq.c
- arch/x86/kernel/irq_32.c 1 addition, 0 deletionsarch/x86/kernel/irq_32.c
- arch/x86/kernel/irq_64.c 1 addition, 0 deletionsarch/x86/kernel/irq_64.c
- arch/x86/kernel/irqinit.c 1 addition, 0 deletionsarch/x86/kernel/irqinit.c
- arch/x86/kernel/smpboot.c 1 addition, 0 deletionsarch/x86/kernel/smpboot.c
- arch/x86/kernel/time.c 1 addition, 0 deletionsarch/x86/kernel/time.c
- arch/x86/mm/pti.c 1 addition, 0 deletionsarch/x86/mm/pti.c
- arch/x86/platform/intel-mid/device_libs/platform_mrfld_wdt.c 1 addition, 0 deletionsarch/x86/platform/intel-mid/device_libs/platform_mrfld_wdt.c
- arch/x86/xen/enlighten.c 1 addition, 0 deletionsarch/x86/xen/enlighten.c
Loading
Please register or sign in to comment