Skip to contentSkip to conversation

i386 include linux/irq.h rather than asm/hw_irq.h

PATCH In review Nick Piggin 1 participant 2 messages Sep 30, 2005

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 i386 include linux/irq.h rather than asm/hw_irq.h

Hi,

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).

Signature · 1 line
SUSE Labs, Novell Inc.
arch/i386/kernel/acpi/boot.c +1 -1
Index: linux-2.6/arch/i386/kernel/acpi/boot.c
===================================================================
@@ -29,12 +29,12 @@
 #include <linux/efi.h>
 #include <linux/module.h>
 #include <linux/dmi.h>
+#include <linux/irq.h>
 
 #include <asm/pgtable.h>
 #include <asm/io_apic.h>
 #include <asm/apic.h>
 #include <asm/io.h>
-#include <asm/irq.h>
 #include <asm/mpspec.h>
 
 #ifdef	CONFIG_X86_64
arch/i386/pci/acpi.c +1 -1
Index: linux-2.6/arch/i386/pci/acpi.c
===================================================================
@@ -1,7 +1,7 @@
 #include <linux/pci.h>
 #include <linux/acpi.h>
 #include <linux/init.h>
-#include <asm/hw_irq.h>
+#include <linux/irq.h>
 #include <asm/numa.h>
 #include "pci.h"
 
arch/i386/pci/irq.c +1 -1
Index: linux-2.6/arch/i386/pci/irq.c
===================================================================
@@ -15,7 +15,7 @@
 #include <asm/io.h>
 #include <asm/smp.h>
 #include <asm/io_apic.h>
-#include <asm/hw_irq.h>
+#include <linux/irq.h>
 #include <linux/acpi.h>
 
 #include "pci.h"
#1 lore raw
Quoted 6 lines · Nick Piggin

Hi,

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).

Note that I didn't do an audit for this, but merely got my system compiling and booting.

Looks like quite a few other places that directly include hw_irq.h should also be converted, if this is indeed the right way to do it.

Signature · 3 lines
SUSE Labs, Novell Inc.

Send instant messages to your online friends http://au.messenger.yahoo.com