diff options
| author | Yinghai Lu | 2009-02-17 08:02:14 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2009-02-17 12:22:20 +0100 |
| commit | c1eeb2de41d7015678bdd412b48a5f071b84e29a (patch) | |
| tree | 6af99f46f557f9e854e882deac52d23b2fadb5a2 /arch/x86/kernel/nmi.c | |
| parent | x86: add x2apic config (diff) | |
| download | kernel-qcow2-linux-c1eeb2de41d7015678bdd412b48a5f071b84e29a.tar.gz kernel-qcow2-linux-c1eeb2de41d7015678bdd412b48a5f071b84e29a.tar.xz kernel-qcow2-linux-c1eeb2de41d7015678bdd412b48a5f071b84e29a.zip | |
x86: fold apic_ops into genapic
Impact: cleanup
make it simpler, don't need have one extra struct.
v2: fix the sgi_uv build
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/nmi.c')
| -rw-r--r-- | arch/x86/kernel/nmi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c index bdfad80c3cf1..48b9ca5e088c 100644 --- a/arch/x86/kernel/nmi.c +++ b/arch/x86/kernel/nmi.c @@ -11,7 +11,7 @@ * Mikael Pettersson : PM converted to driver model. Disable/enable API. */ -#include <asm/apic.h> +#include <asm/genapic.h> #include <linux/nmi.h> #include <linux/mm.h> |