diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/include/asm/es7000/mpparse.h | 6 | ||||
-rw-r--r-- | arch/x86/include/asm/mach-default/mach_mpparse.h | 2 | ||||
-rw-r--r-- | arch/x86/include/asm/mach-generic/mach_mpparse.h | 3 | ||||
-rw-r--r-- | arch/x86/include/asm/summit/mpparse.h | 4 | ||||
-rw-r--r-- | arch/x86/kernel/mpparse.c | 2 | ||||
-rw-r--r-- | arch/x86/mach-generic/bigsmp.c | 2 | ||||
-rw-r--r-- | arch/x86/mach-generic/default.c | 2 | ||||
-rw-r--r-- | arch/x86/mach-generic/es7000.c | 5 | ||||
-rw-r--r-- | arch/x86/mach-generic/numaq.c | 4 | ||||
-rw-r--r-- | arch/x86/mach-generic/probe.c | 3 | ||||
-rw-r--r-- | arch/x86/mach-generic/summit.c | 2 |
11 files changed, 15 insertions, 20 deletions
diff --git a/arch/x86/include/asm/es7000/mpparse.h b/arch/x86/include/asm/es7000/mpparse.h index 30692c4ae859..662eb1e574de 100644 --- a/arch/x86/include/asm/es7000/mpparse.h +++ b/arch/x86/include/asm/es7000/mpparse.h | |||
@@ -8,13 +8,7 @@ extern int find_unisys_acpi_oem_table(unsigned long *oem_addr); | |||
8 | extern void unmap_unisys_acpi_oem_table(unsigned long oem_addr); | 8 | extern void unmap_unisys_acpi_oem_table(unsigned long oem_addr); |
9 | extern void setup_unisys(void); | 9 | extern void setup_unisys(void); |
10 | 10 | ||
11 | #ifndef CONFIG_X86_GENERICARCH | ||
12 | extern int default_acpi_madt_oem_check(char *oem_id, char *oem_table_id); | ||
13 | extern int mps_oem_check(struct mpc_table *mpc, char *oem, char *productid); | ||
14 | #endif | ||
15 | |||
16 | #ifdef CONFIG_ACPI | 11 | #ifdef CONFIG_ACPI |
17 | |||
18 | static inline int es7000_check_dsdt(void) | 12 | static inline int es7000_check_dsdt(void) |
19 | { | 13 | { |
20 | struct acpi_table_header header; | 14 | struct acpi_table_header header; |
diff --git a/arch/x86/include/asm/mach-default/mach_mpparse.h b/arch/x86/include/asm/mach-default/mach_mpparse.h index 8fa01770ba62..af0da140df95 100644 --- a/arch/x86/include/asm/mach-default/mach_mpparse.h +++ b/arch/x86/include/asm/mach-default/mach_mpparse.h | |||
@@ -2,7 +2,7 @@ | |||
2 | #define _ASM_X86_MACH_DEFAULT_MACH_MPPARSE_H | 2 | #define _ASM_X86_MACH_DEFAULT_MACH_MPPARSE_H |
3 | 3 | ||
4 | static inline int | 4 | static inline int |
5 | mps_oem_check(struct mpc_table *mpc, char *oem, char *productid) | 5 | generic_mps_oem_check(struct mpc_table *mpc, char *oem, char *productid) |
6 | { | 6 | { |
7 | return 0; | 7 | return 0; |
8 | } | 8 | } |
diff --git a/arch/x86/include/asm/mach-generic/mach_mpparse.h b/arch/x86/include/asm/mach-generic/mach_mpparse.h index f497d96c76bb..22bfb56f8fbd 100644 --- a/arch/x86/include/asm/mach-generic/mach_mpparse.h +++ b/arch/x86/include/asm/mach-generic/mach_mpparse.h | |||
@@ -1,8 +1,7 @@ | |||
1 | #ifndef _ASM_X86_MACH_GENERIC_MACH_MPPARSE_H | 1 | #ifndef _ASM_X86_MACH_GENERIC_MACH_MPPARSE_H |
2 | #define _ASM_X86_MACH_GENERIC_MACH_MPPARSE_H | 2 | #define _ASM_X86_MACH_GENERIC_MACH_MPPARSE_H |
3 | 3 | ||
4 | 4 | extern int generic_mps_oem_check(struct mpc_table *, char *, char *); | |
5 | extern int mps_oem_check(struct mpc_table *, char *, char *); | ||
6 | 5 | ||
7 | extern int default_acpi_madt_oem_check(char *, char *); | 6 | extern int default_acpi_madt_oem_check(char *, char *); |
8 | 7 | ||
diff --git a/arch/x86/include/asm/summit/mpparse.h b/arch/x86/include/asm/summit/mpparse.h index 555ed8238e94..4bbcce39acb8 100644 --- a/arch/x86/include/asm/summit/mpparse.h +++ b/arch/x86/include/asm/summit/mpparse.h | |||
@@ -11,8 +11,8 @@ extern void setup_summit(void); | |||
11 | #define setup_summit() {} | 11 | #define setup_summit() {} |
12 | #endif | 12 | #endif |
13 | 13 | ||
14 | static inline int mps_oem_check(struct mpc_table *mpc, char *oem, | 14 | static inline int |
15 | char *productid) | 15 | summit_mps_oem_check(struct mpc_table *mpc, char *oem, char *productid) |
16 | { | 16 | { |
17 | if (!strncmp(oem, "IBM ENSW", 8) && | 17 | if (!strncmp(oem, "IBM ENSW", 8) && |
18 | (!strncmp(productid, "VIGIL SMP", 9) | 18 | (!strncmp(productid, "VIGIL SMP", 9) |
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c index f6fb1928439d..b12fa5ce6f58 100644 --- a/arch/x86/kernel/mpparse.c +++ b/arch/x86/kernel/mpparse.c | |||
@@ -292,7 +292,7 @@ static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early) | |||
292 | return 0; | 292 | return 0; |
293 | 293 | ||
294 | #ifdef CONFIG_X86_32 | 294 | #ifdef CONFIG_X86_32 |
295 | mps_oem_check(mpc, oem, str); | 295 | generic_mps_oem_check(mpc, oem, str); |
296 | #endif | 296 | #endif |
297 | /* save the local APIC address, it might be non-default */ | 297 | /* save the local APIC address, it might be non-default */ |
298 | if (!acpi_lapic) | 298 | if (!acpi_lapic) |
diff --git a/arch/x86/mach-generic/bigsmp.c b/arch/x86/mach-generic/bigsmp.c index d04b38954df3..6bf6aafeb2c6 100644 --- a/arch/x86/mach-generic/bigsmp.c +++ b/arch/x86/mach-generic/bigsmp.c | |||
@@ -88,7 +88,7 @@ struct genapic apic_bigsmp = { | |||
88 | .check_phys_apicid_present = bigsmp_check_phys_apicid_present, | 88 | .check_phys_apicid_present = bigsmp_check_phys_apicid_present, |
89 | .enable_apic_mode = NULL, | 89 | .enable_apic_mode = NULL, |
90 | .phys_pkg_id = bigsmp_phys_pkg_id, | 90 | .phys_pkg_id = bigsmp_phys_pkg_id, |
91 | .mps_oem_check = mps_oem_check, | 91 | .mps_oem_check = NULL, |
92 | 92 | ||
93 | .get_apic_id = get_apic_id, | 93 | .get_apic_id = get_apic_id, |
94 | .set_apic_id = NULL, | 94 | .set_apic_id = NULL, |
diff --git a/arch/x86/mach-generic/default.c b/arch/x86/mach-generic/default.c index 5c9266f756e0..e5f85cd75b43 100644 --- a/arch/x86/mach-generic/default.c +++ b/arch/x86/mach-generic/default.c | |||
@@ -69,7 +69,7 @@ struct genapic apic_default = { | |||
69 | .check_phys_apicid_present = default_check_phys_apicid_present, | 69 | .check_phys_apicid_present = default_check_phys_apicid_present, |
70 | .enable_apic_mode = NULL, | 70 | .enable_apic_mode = NULL, |
71 | .phys_pkg_id = default_phys_pkg_id, | 71 | .phys_pkg_id = default_phys_pkg_id, |
72 | .mps_oem_check = mps_oem_check, | 72 | .mps_oem_check = NULL, |
73 | 73 | ||
74 | .get_apic_id = get_apic_id, | 74 | .get_apic_id = get_apic_id, |
75 | .set_apic_id = NULL, | 75 | .set_apic_id = NULL, |
diff --git a/arch/x86/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c index 52787e34c9cc..f861163cd396 100644 --- a/arch/x86/mach-generic/es7000.c +++ b/arch/x86/mach-generic/es7000.c | |||
@@ -36,11 +36,12 @@ static int probe_es7000(void) | |||
36 | } | 36 | } |
37 | 37 | ||
38 | static __init int | 38 | static __init int |
39 | mps_oem_check(struct mpc_table *mpc, char *oem, char *productid) | 39 | es7000_mps_oem_check(struct mpc_table *mpc, char *oem, char *productid) |
40 | { | 40 | { |
41 | if (mpc->oemptr) { | 41 | if (mpc->oemptr) { |
42 | struct mpc_oemtable *oem_table = | 42 | struct mpc_oemtable *oem_table = |
43 | (struct mpc_oemtable *)mpc->oemptr; | 43 | (struct mpc_oemtable *)mpc->oemptr; |
44 | |||
44 | if (!strncmp(oem, "UNISYS", 6)) | 45 | if (!strncmp(oem, "UNISYS", 6)) |
45 | return parse_unisys_oem((char *)oem_table); | 46 | return parse_unisys_oem((char *)oem_table); |
46 | } | 47 | } |
@@ -123,7 +124,7 @@ struct genapic apic_es7000 = { | |||
123 | .check_phys_apicid_present = es7000_check_phys_apicid_present, | 124 | .check_phys_apicid_present = es7000_check_phys_apicid_present, |
124 | .enable_apic_mode = es7000_enable_apic_mode, | 125 | .enable_apic_mode = es7000_enable_apic_mode, |
125 | .phys_pkg_id = es7000_phys_pkg_id, | 126 | .phys_pkg_id = es7000_phys_pkg_id, |
126 | .mps_oem_check = mps_oem_check, | 127 | .mps_oem_check = es7000_mps_oem_check, |
127 | 128 | ||
128 | .get_apic_id = get_apic_id, | 129 | .get_apic_id = get_apic_id, |
129 | .set_apic_id = NULL, | 130 | .set_apic_id = NULL, |
diff --git a/arch/x86/mach-generic/numaq.c b/arch/x86/mach-generic/numaq.c index 6a1134e6d72d..517882c9c15a 100644 --- a/arch/x86/mach-generic/numaq.c +++ b/arch/x86/mach-generic/numaq.c | |||
@@ -19,7 +19,7 @@ | |||
19 | #include <asm/numaq/wakecpu.h> | 19 | #include <asm/numaq/wakecpu.h> |
20 | #include <asm/numaq.h> | 20 | #include <asm/numaq.h> |
21 | 21 | ||
22 | static int mps_oem_check(struct mpc_table *mpc, char *oem, char *productid) | 22 | static int __numaq_mps_oem_check(struct mpc_table *mpc, char *oem, char *productid) |
23 | { | 23 | { |
24 | numaq_mps_oem_check(mpc, oem, productid); | 24 | numaq_mps_oem_check(mpc, oem, productid); |
25 | return found_numaq; | 25 | return found_numaq; |
@@ -88,7 +88,7 @@ struct genapic apic_numaq = { | |||
88 | .check_phys_apicid_present = numaq_check_phys_apicid_present, | 88 | .check_phys_apicid_present = numaq_check_phys_apicid_present, |
89 | .enable_apic_mode = NULL, | 89 | .enable_apic_mode = NULL, |
90 | .phys_pkg_id = numaq_phys_pkg_id, | 90 | .phys_pkg_id = numaq_phys_pkg_id, |
91 | .mps_oem_check = mps_oem_check, | 91 | .mps_oem_check = __numaq_mps_oem_check, |
92 | 92 | ||
93 | .get_apic_id = get_apic_id, | 93 | .get_apic_id = get_apic_id, |
94 | .set_apic_id = NULL, | 94 | .set_apic_id = NULL, |
diff --git a/arch/x86/mach-generic/probe.c b/arch/x86/mach-generic/probe.c index 799a70f4d90e..ab68c6e5c48a 100644 --- a/arch/x86/mach-generic/probe.c +++ b/arch/x86/mach-generic/probe.c | |||
@@ -110,7 +110,8 @@ void __init generic_apic_probe(void) | |||
110 | 110 | ||
111 | /* These functions can switch the APIC even after the initial ->probe() */ | 111 | /* These functions can switch the APIC even after the initial ->probe() */ |
112 | 112 | ||
113 | int __init mps_oem_check(struct mpc_table *mpc, char *oem, char *productid) | 113 | int __init |
114 | generic_mps_oem_check(struct mpc_table *mpc, char *oem, char *productid) | ||
114 | { | 115 | { |
115 | int i; | 116 | int i; |
116 | 117 | ||
diff --git a/arch/x86/mach-generic/summit.c b/arch/x86/mach-generic/summit.c index 2d6843a61d97..719e944ff308 100644 --- a/arch/x86/mach-generic/summit.c +++ b/arch/x86/mach-generic/summit.c | |||
@@ -68,7 +68,7 @@ struct genapic apic_summit = { | |||
68 | .check_phys_apicid_present = summit_check_phys_apicid_present, | 68 | .check_phys_apicid_present = summit_check_phys_apicid_present, |
69 | .enable_apic_mode = NULL, | 69 | .enable_apic_mode = NULL, |
70 | .phys_pkg_id = summit_phys_pkg_id, | 70 | .phys_pkg_id = summit_phys_pkg_id, |
71 | .mps_oem_check = mps_oem_check, | 71 | .mps_oem_check = summit_mps_oem_check, |
72 | 72 | ||
73 | .get_apic_id = get_apic_id, | 73 | .get_apic_id = get_apic_id, |
74 | .set_apic_id = NULL, | 74 | .set_apic_id = NULL, |