Skip to content

Commit

Permalink
[PATCH] i386: include linux/irq.h rather than asm/hw_irq.h
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Nick Piggin authored and Linus Torvalds committed Sep 30, 2005
1 parent 03cdc0c commit b33fa1f
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion arch/i386/kernel/acpi/boot.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion arch/i386/pci/acpi.c
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
2 changes: 1 addition & 1 deletion arch/i386/pci/irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit b33fa1f

Please sign in to comment.