tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[PATCH] i386: include linux/irq.h rather than asm/hw_irq.h

I need the following patch to compile -git8 here, otherwise these
files fail to compile (asm/hw_irq.h needs definitions from
linux/irq.h and that file provides the required include ordering).

I did not do a full audit, though there looks to be many other
places that should get the same treatment, if this is the right
way to do it.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Nick Piggin and committed by Linus Torvalds b33fa1f3 03cdc0c3

+3 -3
unified split
+1 -1
arch/i386/kernel/acpi/boot.c
··· 29 29 #include <linux/efi.h> 30 30 #include <linux/module.h> 31 31 #include <linux/dmi.h> 32 + #include <linux/irq.h> 32 33 33 34 #include <asm/pgtable.h> 34 35 #include <asm/io_apic.h> 35 36 #include <asm/apic.h> 36 37 #include <asm/io.h> 37 - #include <asm/irq.h> 38 38 #include <asm/mpspec.h> 39 39 40 40 #ifdef CONFIG_X86_64
+1 -1
arch/i386/pci/acpi.c
··· 1 1 #include <linux/pci.h> 2 2 #include <linux/acpi.h> 3 3 #include <linux/init.h> 4 - #include <asm/hw_irq.h> 4 + #include <linux/irq.h> 5 5 #include <asm/numa.h> 6 6 #include "pci.h" 7 7
+1 -1
arch/i386/pci/irq.c
··· 15 15 #include <asm/io.h> 16 16 #include <asm/smp.h> 17 17 #include <asm/io_apic.h> 18 - #include <asm/hw_irq.h> 18 + #include <linux/irq.h> 19 19 #include <linux/acpi.h> 20 20 21 21 #include "pci.h"