Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c764247 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86: consolidate the ->mps_oem_check() code 



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

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 1322a2e2

arch/x86/include/asm/es7000/mpparse.h

+0 −6
Original line number Diff line number Diff line
@@ -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;

arch/x86/include/asm/mach-default/mach_mpparse.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

arch/x86/include/asm/mach-generic/mach_mpparse.h

+1 −2
Original line number Diff line number Diff line 
#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 *);

arch/x86/include/asm/summit/mpparse.h

+2 −2
Original line number Diff line number Diff line
@@ -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)

arch/x86/kernel/mpparse.c

+1 −1
Original line number Diff line number Diff line
@@ -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)