Commit 306db03b authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86: clean up apic->acpi_madt_oem_check methods 



Impact: refactor code

x86 subarchitectures each defined a "acpi_madt_oem_check()" method,
which could be an inline function, or an extern, or a static function,
and which was also the name of a genapic field.

Untangle this namespace spaghetti by setting ->acpi_madt_oem_check()
to NULL on those subarchitectures that have no detection quirks,
and rename the other ones (summit, es7000) that do.

Also change default_acpi_madt_oem_check() to handle NULL entries,
and clean its control flow up as well.

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

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

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ extern void unmap_unisys_acpi_oem_table(unsigned long oem_addr); 
extern void setup_unisys(void);



#ifndef CONFIG_X86_GENERICARCH

extern int acpi_madt_oem_check(char *oem_id, char *oem_table_id);

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

arch/x86/include/asm/genapic.h

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ extern struct genapic apic_flat; 
extern struct genapic apic_physflat;

extern struct genapic apic_x2apic_cluster;

extern struct genapic apic_x2apic_phys;

extern int acpi_madt_oem_check(char *, char *);

extern int default_acpi_madt_oem_check(char *, char *);



extern void apic_send_IPI_self(int vector);

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

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ mps_oem_check(struct mpc_table *mpc, char *oem, char *productid) 
}



/* Hook from generic ACPI tables.c */

static inline int acpi_madt_oem_check(char *oem_id, char *oem_table_id)

static inline int default_acpi_madt_oem_check(char *oem_id, char *oem_table_id)

{

	return 0;

}

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

+1 −1
Original line number Diff line number Diff line
@@ -4,6 +4,6 @@ 


extern int mps_oem_check(struct mpc_table *, char *, char *);



extern int acpi_madt_oem_check(char *, char *);

extern int default_acpi_madt_oem_check(char *, char *);



#endif /* _ASM_X86_MACH_GENERIC_MACH_MPPARSE_H */

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

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ static inline int mps_oem_check(struct mpc_table *mpc, char *oem, 
}



/* Hook from generic ACPI tables.c */

static inline int acpi_madt_oem_check(char *oem_id, char *oem_table_id)

static inline int summit_acpi_madt_oem_check(char *oem_id, char *oem_table_id)

{

	if (!strncmp(oem_id, "IBM", 3) &&

	    (!strncmp(oem_table_id, "SERVIGIL", 8)

CRA Git | Maintained and supported by SUSTech CRA and CCSE