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

Nick Piggin
2005-09-30T15:37:23Z

[-- Attachment #1: Type: text/plain, Size: 226 bytes --]

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

--
SUSE Labs, Novell Inc.

[-- Attachment #2: i386-irq-include.patch --]
[-- Type: text/plain, Size: 1215 bytes --]

Index: linux-2.6/arch/i386/kernel/acpi/boot.c
===================================================================
--- linux-2.6.orig/arch/i386/kernel/acpi/boot.c
+++ 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
Index: linux-2.6/arch/i386/pci/acpi.c
===================================================================
--- linux-2.6.orig/arch/i386/pci/acpi.c
+++ 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"

Index: linux-2.6/arch/i386/pci/irq.c
===================================================================
--- linux-2.6.orig/arch/i386/pci/irq.c
+++ 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"