aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-28 11:36:56 -0500
committerIngo Molnar <mingo@elte.hu>2009-01-28 17:20:36 -0500
commit1f75ed0c1311a50ed393bcac258de65680d360e5 (patch)
treea01ba549ce874af2167543aa91769bfedd508220 /arch/x86/kernel
parentb2af018ff26f1a2a026f548f7f0e552589905689 (diff)
x86: remove mach_apicdef.h
Move its definitions into apic.h. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/apic.c1
-rw-r--r--arch/x86/kernel/genapic_flat_64.c1
-rw-r--r--arch/x86/kernel/io_apic.c1
-rw-r--r--arch/x86/kernel/mpparse.c3
4 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/kernel/apic.c b/arch/x86/kernel/apic.c
index 84b8e7c57abc..e6220809ca11 100644
--- a/arch/x86/kernel/apic.c
+++ b/arch/x86/kernel/apic.c
@@ -50,7 +50,6 @@
50#include <asm/smp.h> 50#include <asm/smp.h>
51 51
52#include <mach_apic.h> 52#include <mach_apic.h>
53#include <mach_apicdef.h>
54#include <mach_ipi.h> 53#include <mach_ipi.h>
55 54
56/* 55/*
diff --git a/arch/x86/kernel/genapic_flat_64.c b/arch/x86/kernel/genapic_flat_64.c
index e9237f599282..19bffb3f7320 100644
--- a/arch/x86/kernel/genapic_flat_64.c
+++ b/arch/x86/kernel/genapic_flat_64.c
@@ -19,7 +19,6 @@
19#include <asm/smp.h> 19#include <asm/smp.h>
20#include <asm/ipi.h> 20#include <asm/ipi.h>
21#include <asm/genapic.h> 21#include <asm/genapic.h>
22#include <mach_apicdef.h>
23 22
24#ifdef CONFIG_ACPI 23#ifdef CONFIG_ACPI
25#include <acpi/acpi_bus.h> 24#include <acpi/acpi_bus.h>
diff --git a/arch/x86/kernel/io_apic.c b/arch/x86/kernel/io_apic.c
index e90970ce21a0..abae81989c2f 100644
--- a/arch/x86/kernel/io_apic.c
+++ b/arch/x86/kernel/io_apic.c
@@ -64,7 +64,6 @@
64 64
65#include <mach_ipi.h> 65#include <mach_ipi.h>
66#include <mach_apic.h> 66#include <mach_apic.h>
67#include <mach_apicdef.h>
68 67
69#define __apicdebuginit(type) static type __init 68#define __apicdebuginit(type) static type __init
70 69
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index c6930162b3be..a1452a53d14f 100644
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -30,9 +30,6 @@
30#include <asm/smp.h> 30#include <asm/smp.h>
31 31
32#include <mach_apic.h> 32#include <mach_apic.h>
33#ifdef CONFIG_X86_32
34#include <mach_apicdef.h>
35#endif
36 33
37/* 34/*
38 * Checksum an MP configuration block. 35 * Checksum an MP configuration block.