aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/include/asm/apic.h16
-rw-r--r--arch/x86/include/asm/mach-default/mach_apic.h1
-rw-r--r--arch/x86/include/asm/mach-default/mach_apicdef.h22
-rw-r--r--arch/x86/include/asm/mach-generic/mach_apicdef.h8
-rw-r--r--arch/x86/include/asm/smp.h4
-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
-rw-r--r--arch/x86/mach-generic/default.c1
10 files changed, 18 insertions, 40 deletions
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index e8f030440bc7..3a3202074c63 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -211,4 +211,20 @@ static inline void disable_local_APIC(void) { }
211 211
212#endif /* !CONFIG_X86_LOCAL_APIC */ 212#endif /* !CONFIG_X86_LOCAL_APIC */
213 213
214#ifdef CONFIG_X86_64
215#define SET_APIC_ID(x) (apic->set_apic_id(x))
216#else
217
218static inline unsigned default_get_apic_id(unsigned long x)
219{
220 unsigned int ver = GET_APIC_VERSION(apic_read(APIC_LVR));
221
222 if (APIC_XAPIC(ver))
223 return (x >> 24) & 0xFF;
224 else
225 return (x >> 24) & 0x0F;
226}
227
228#endif
229
214#endif /* _ASM_X86_APIC_H */ 230#endif /* _ASM_X86_APIC_H */
diff --git a/arch/x86/include/asm/mach-default/mach_apic.h b/arch/x86/include/asm/mach-default/mach_apic.h
index 2e4104cf3481..b60b767d5be0 100644
--- a/arch/x86/include/asm/mach-default/mach_apic.h
+++ b/arch/x86/include/asm/mach-default/mach_apic.h
@@ -3,7 +3,6 @@
3 3
4#ifdef CONFIG_X86_LOCAL_APIC 4#ifdef CONFIG_X86_LOCAL_APIC
5 5
6#include <mach_apicdef.h>
7#include <asm/smp.h> 6#include <asm/smp.h>
8 7
9#define APIC_DFR_VALUE (APIC_DFR_FLAT) 8#define APIC_DFR_VALUE (APIC_DFR_FLAT)
diff --git a/arch/x86/include/asm/mach-default/mach_apicdef.h b/arch/x86/include/asm/mach-default/mach_apicdef.h
deleted file mode 100644
index 5141085962d3..000000000000
--- a/arch/x86/include/asm/mach-default/mach_apicdef.h
+++ /dev/null
@@ -1,22 +0,0 @@
1#ifndef _ASM_X86_MACH_DEFAULT_MACH_APICDEF_H
2#define _ASM_X86_MACH_DEFAULT_MACH_APICDEF_H
3
4#include <asm/apic.h>
5
6#ifdef CONFIG_X86_64
7#define SET_APIC_ID(x) (apic->set_apic_id(x))
8#else
9
10static inline unsigned default_get_apic_id(unsigned long x)
11{
12 unsigned int ver = GET_APIC_VERSION(apic_read(APIC_LVR));
13
14 if (APIC_XAPIC(ver))
15 return (x >> 24) & 0xFF;
16 else
17 return (x >> 24) & 0x0F;
18}
19
20#endif
21
22#endif /* _ASM_X86_MACH_DEFAULT_MACH_APICDEF_H */
diff --git a/arch/x86/include/asm/mach-generic/mach_apicdef.h b/arch/x86/include/asm/mach-generic/mach_apicdef.h
deleted file mode 100644
index 61caa65b13fb..000000000000
--- a/arch/x86/include/asm/mach-generic/mach_apicdef.h
+++ /dev/null
@@ -1,8 +0,0 @@
1#ifndef _ASM_X86_MACH_GENERIC_MACH_APICDEF_H
2#define _ASM_X86_MACH_GENERIC_MACH_APICDEF_H
3
4#ifndef APIC_DEFINITION
5#include <asm/genapic.h>
6#endif
7
8#endif /* _ASM_X86_MACH_GENERIC_MACH_APICDEF_H */
diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
index c63d480802af..d4ac4de4bcec 100644
--- a/arch/x86/include/asm/smp.h
+++ b/arch/x86/include/asm/smp.h
@@ -173,6 +173,8 @@ extern int safe_smp_processor_id(void);
173 173
174#endif 174#endif
175 175
176#include <asm/genapic.h>
177
176#ifdef CONFIG_X86_LOCAL_APIC 178#ifdef CONFIG_X86_LOCAL_APIC
177 179
178#ifndef CONFIG_X86_64 180#ifndef CONFIG_X86_64
@@ -182,7 +184,6 @@ static inline int logical_smp_processor_id(void)
182 return GET_APIC_LOGICAL_ID(*(u32 *)(APIC_BASE + APIC_LDR)); 184 return GET_APIC_LOGICAL_ID(*(u32 *)(APIC_BASE + APIC_LDR));
183} 185}
184 186
185#include <mach_apicdef.h>
186static inline unsigned int read_apic_id(void) 187static inline unsigned int read_apic_id(void)
187{ 188{
188 unsigned int reg; 189 unsigned int reg;
@@ -197,7 +198,6 @@ static inline unsigned int read_apic_id(void)
197# if defined(APIC_DEFINITION) || defined(CONFIG_X86_64) 198# if defined(APIC_DEFINITION) || defined(CONFIG_X86_64)
198extern int hard_smp_processor_id(void); 199extern int hard_smp_processor_id(void);
199# else 200# else
200#include <mach_apicdef.h>
201static inline int hard_smp_processor_id(void) 201static inline int hard_smp_processor_id(void)
202{ 202{
203 /* we don't want to mark this access volatile - bad code generation */ 203 /* we don't want to mark this access volatile - bad code generation */
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.
diff --git a/arch/x86/mach-generic/default.c b/arch/x86/mach-generic/default.c
index 6485e57e29b1..07817b2a7876 100644
--- a/arch/x86/mach-generic/default.c
+++ b/arch/x86/mach-generic/default.c
@@ -5,7 +5,6 @@
5#include <linux/threads.h> 5#include <linux/threads.h>
6#include <linux/cpumask.h> 6#include <linux/cpumask.h>
7#include <asm/mpspec.h> 7#include <asm/mpspec.h>
8#include <asm/mach-default/mach_apicdef.h>
9#include <asm/genapic.h> 8#include <asm/genapic.h>
10#include <asm/fixmap.h> 9#include <asm/fixmap.h>
11#include <asm/apicdef.h> 10#include <asm/apicdef.h>