Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

x86: consolidate the ->mps_oem_check() code

Browse source 
- spread out the mps_oem_check() namespace on a per APIC driver basis

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar 2009-01-28 13:44:32 +01:00
parent 1322a2e2db
commit 9c7642470e
11 changed files with 15 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/x86/include/asm/es7000/mpparse.h
View file

@ -8,13 +8,7 @@ extern int find_unisys_acpi_oem_table(unsigned long *oem_addr);
extern void unmap_unisys_acpi_oem_table(unsigned long oem_addr);
extern void setup_unisys(void);
#ifndef CONFIG_X86_GENERICARCH
extern int default_acpi_madt_oem_check(char *oem_id, char *oem_table_id);
extern int mps_oem_check(struct mpc_table *mpc, char *oem, char *productid);
#endif
#ifdef CONFIG_ACPI
static inline int es7000_check_dsdt(void)
{
struct acpi_table_header header;

2
arch/x86/include/asm/mach-default/mach_mpparse.h
View file

@ -2,7 +2,7 @@
#define _ASM_X86_MACH_DEFAULT_MACH_MPPARSE_H
static inline int
mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
generic_mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
{
return 0;
}

3
arch/x86/include/asm/mach-generic/mach_mpparse.h
View file

@ -1,8 +1,7 @@
#ifndef _ASM_X86_MACH_GENERIC_MACH_MPPARSE_H
#define _ASM_X86_MACH_GENERIC_MACH_MPPARSE_H
extern int mps_oem_check(struct mpc_table *, char *, char *);
extern int generic_mps_oem_check(struct mpc_table *, char *, char *);
extern int default_acpi_madt_oem_check(char *, char *);

4
arch/x86/include/asm/summit/mpparse.h
View file

@ -11,8 +11,8 @@ extern void setup_summit(void);
#define setup_summit() {}
#endif
static inline int mps_oem_check(struct mpc_table *mpc, char *oem,
char *productid)
static inline int
summit_mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
{
if (!strncmp(oem, "IBM ENSW", 8) &&
(!strncmp(productid, "VIGIL SMP", 9)

2
arch/x86/kernel/mpparse.c
View file

@ -292,7 +292,7 @@ static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early)
return 0;
#ifdef CONFIG_X86_32
mps_oem_check(mpc, oem, str);
generic_mps_oem_check(mpc, oem, str);
#endif
/* save the local APIC address, it might be non-default */
if (!acpi_lapic)

2
arch/x86/mach-generic/bigsmp.c
View file

@ -88,7 +88,7 @@ struct genapic apic_bigsmp = {
.check_phys_apicid_present = bigsmp_check_phys_apicid_present,
.enable_apic_mode = NULL,
.phys_pkg_id = bigsmp_phys_pkg_id,
.mps_oem_check = mps_oem_check,
.mps_oem_check = NULL,
.get_apic_id = get_apic_id,
.set_apic_id = NULL,

2
arch/x86/mach-generic/default.c
View file

@ -69,7 +69,7 @@ struct genapic apic_default = {
.check_phys_apicid_present = default_check_phys_apicid_present,
.enable_apic_mode = NULL,
.phys_pkg_id = default_phys_pkg_id,
.mps_oem_check = mps_oem_check,
.mps_oem_check = NULL,
.get_apic_id = get_apic_id,
.set_apic_id = NULL,

5
arch/x86/mach-generic/es7000.c
View file

@ -36,11 +36,12 @@ static int probe_es7000(void)
}
static __init int
mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
es7000_mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
{
if (mpc->oemptr) {
struct mpc_oemtable *oem_table =
(struct mpc_oemtable *)mpc->oemptr;
if (!strncmp(oem, "UNISYS", 6))
return parse_unisys_oem((char *)oem_table);
}
@ -123,7 +124,7 @@ struct genapic apic_es7000 = {
.check_phys_apicid_present = es7000_check_phys_apicid_present,
.enable_apic_mode = es7000_enable_apic_mode,
.phys_pkg_id = es7000_phys_pkg_id,
.mps_oem_check = mps_oem_check,
.mps_oem_check = es7000_mps_oem_check,
.get_apic_id = get_apic_id,
.set_apic_id = NULL,

4
arch/x86/mach-generic/numaq.c
View file

@ -19,7 +19,7 @@
#include <asm/numaq/wakecpu.h>
#include <asm/numaq.h>
static int mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
static int __numaq_mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
{
numaq_mps_oem_check(mpc, oem, productid);
return found_numaq;
@ -88,7 +88,7 @@ struct genapic apic_numaq = {
.check_phys_apicid_present = numaq_check_phys_apicid_present,
.enable_apic_mode = NULL,
.phys_pkg_id = numaq_phys_pkg_id,
.mps_oem_check = mps_oem_check,
.mps_oem_check = __numaq_mps_oem_check,
.get_apic_id = get_apic_id,
.set_apic_id = NULL,

3
arch/x86/mach-generic/probe.c
View file

@ -110,7 +110,8 @@ void __init generic_apic_probe(void)
/* These functions can switch the APIC even after the initial ->probe() */
int __init mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
int __init
generic_mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
{
int i;

2
arch/x86/mach-generic/summit.c
View file

@ -68,7 +68,7 @@ struct genapic apic_summit = {
.check_phys_apicid_present = summit_check_phys_apicid_present,
.enable_apic_mode = NULL,
.phys_pkg_id = summit_phys_pkg_id,
.mps_oem_check = mps_oem_check,
.mps_oem_check = summit_mps_oem_check,
.get_apic_id = get_apic_id,
.set_apic_id = NULL,