diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-12 18:53:58 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-12 18:53:58 -0500 |
| commit | 3e55f1a292583b11ff85952eec77d65a459da2dd (patch) | |
| tree | 78b315b3389b552f38ed14099c1a5a26b944964c /arch/x86/kernel/apic.c | |
| parent | 9b0c474f0a2366d6a9c4e7a0f348875017a841a5 (diff) | |
| parent | 50c668d678fd01284799a6e4f1b91829d83cb9ed (diff) | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
Revert "cpumask: use work_on_cpu in acpi-cpufreq.c for drv_read and drv_write"
x86: fix apic.c build error on latest git
x86: fix mpparse.c build error on latest git
x86: avoid theoretical vmalloc fault loop
x86, mtrr: fix types used in userspace exported header
Diffstat (limited to 'arch/x86/kernel/apic.c')
| -rw-r--r-- | arch/x86/kernel/apic.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic.c b/arch/x86/kernel/apic.c index 566a08466b19..0f830e4f5675 100644 --- a/arch/x86/kernel/apic.c +++ b/arch/x86/kernel/apic.c | |||
| @@ -47,6 +47,7 @@ | |||
| 47 | #include <asm/proto.h> | 47 | #include <asm/proto.h> |
| 48 | #include <asm/apic.h> | 48 | #include <asm/apic.h> |
| 49 | #include <asm/i8259.h> | 49 | #include <asm/i8259.h> |
| 50 | #include <asm/smp.h> | ||
| 50 | 51 | ||
| 51 | #include <mach_apic.h> | 52 | #include <mach_apic.h> |
| 52 | #include <mach_apicdef.h> | 53 | #include <mach_apicdef.h> |