iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86: rename mp_config_table to mpc_table

Browse Source 
Impact: cleanup, solve 80 columns wrap problems

mp_config_table should be renamed to mpc_table.
The reason: the 'c' in MPC already means 'config' -
no need to repeat that in the type name.

Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Jaswinder Singh Rajput 2009-01-03 15:46:57 +05:30 committed by Ingo Molnar
parent 923a789b49
commit f29521e4ee
13 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/x86/include/asm/es7000/mpparse.h
View File

@ -10,8 +10,7 @@ extern void setup_unisys(void);
#ifndef CONFIG_X86_GENERICARCH #ifndef CONFIG_X86_GENERICARCH
extern int acpi_madt_oem_check(char *oem_id, char *oem_table_id); extern int acpi_madt_oem_check(char *oem_id, char *oem_table_id);
extern int mps_oem_check(struct mp_config_table *mpc, char *oem, extern int mps_oem_check(struct mpc_table *mpc, char *oem, char *productid);
char *productid);
#endif #endif
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI

4
arch/x86/include/asm/genapic_32.h
View File

@ -16,7 +16,7 @@
*/ */
struct mpc_config_bus; struct mpc_config_bus;
struct mp_config_table; struct mpc_table;
struct mpc_config_processor; struct mpc_config_processor;
struct genapic { struct genapic {
@ -51,7 +51,7 @@ struct genapic {
/* When one of the next two hooks returns 1 the genapic /* When one of the next two hooks returns 1 the genapic
is switched to this. Essentially they are additional probe is switched to this. Essentially they are additional probe
functions. */ functions. */
int (*mps_oem_check)(struct mp_config_table *mpc, char *oem, int (*mps_oem_check)(struct mpc_table *mpc, char *oem,
char *productid); char *productid);
int (*acpi_madt_oem_check)(char *oem_id, char *oem_table_id); int (*acpi_madt_oem_check)(char *oem_id, char *oem_table_id);

4
arch/x86/include/asm/mach-default/mach_mpparse.h
View File

@ -1,8 +1,8 @@
#ifndef _ASM_X86_MACH_DEFAULT_MACH_MPPARSE_H #ifndef _ASM_X86_MACH_DEFAULT_MACH_MPPARSE_H
#define _ASM_X86_MACH_DEFAULT_MACH_MPPARSE_H #define _ASM_X86_MACH_DEFAULT_MACH_MPPARSE_H
static inline int mps_oem_check(struct mp_config_table *mpc, char *oem, static inline int
char *productid) mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
{ {
return 0; return 0;
} }

5
arch/x86/include/asm/mach-generic/mach_mpparse.h
View File

@ -2,9 +2,8 @@
#define _ASM_X86_MACH_GENERIC_MACH_MPPARSE_H #define _ASM_X86_MACH_GENERIC_MACH_MPPARSE_H
extern int mps_oem_check(struct mp_config_table *mpc, char *oem, extern int mps_oem_check(struct mpc_table *, char *, char *);
char *productid);
extern int acpi_madt_oem_check(char *oem_id, char *oem_table_id); extern int acpi_madt_oem_check(char *, char *);
#endif /* _ASM_X86_MACH_GENERIC_MACH_MPPARSE_H */ #endif /* _ASM_X86_MACH_GENERIC_MACH_MPPARSE_H */

4
arch/x86/include/asm/mach-generic/mach_mpspec.h
View File

@ -7,6 +7,6 @@
/* Maximum 256 PCI busses, plus 1 ISA bus in each of 4 cabinets. */ /* Maximum 256 PCI busses, plus 1 ISA bus in each of 4 cabinets. */
#define MAX_MP_BUSSES 260 #define MAX_MP_BUSSES 260
extern void numaq_mps_oem_check(struct mp_config_table *mpc, char *oem, extern void numaq_mps_oem_check(struct mpc_table *, char *, char *);
char *productid);
#endif /* _ASM_X86_MACH_GENERIC_MACH_MPSPEC_H */ #endif /* _ASM_X86_MACH_GENERIC_MACH_MPSPEC_H */

2
arch/x86/include/asm/mpspec_def.h
View File

@ -39,7 +39,7 @@ struct intel_mp_floating {
#define MPC_SIGNATURE "PCMP" #define MPC_SIGNATURE "PCMP"
struct mp_config_table { struct mpc_table {
char mpc_signature[4]; char mpc_signature[4];
unsigned short mpc_length; /* Size of table */ unsigned short mpc_length; /* Size of table */
char mpc_spec; /* 0x01 */ char mpc_spec; /* 0x01 */

3
arch/x86/include/asm/numaq/mpparse.h
View File

@ -1,7 +1,6 @@
#ifndef __ASM_NUMAQ_MPPARSE_H #ifndef __ASM_NUMAQ_MPPARSE_H
#define __ASM_NUMAQ_MPPARSE_H #define __ASM_NUMAQ_MPPARSE_H
extern void numaq_mps_oem_check(struct mp_config_table *mpc, char *oem, extern void numaq_mps_oem_check(struct mpc_table *, char *, char *);
char *productid);
#endif /* __ASM_NUMAQ_MPPARSE_H */ #endif /* __ASM_NUMAQ_MPPARSE_H */

2
arch/x86/include/asm/summit/mpparse.h
View File

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

10
arch/x86/kernel/mpparse.c
View File

@ -246,8 +246,7 @@ static void __init MP_lintsrc_info(struct mpc_config_lintsrc *m)
* Read/parse the MPC * Read/parse the MPC
*/ */
static int __init smp_check_mpc(struct mp_config_table *mpc, char *oem, static int __init smp_check_mpc(struct mpc_table *mpc, char *oem, char *str)
char *str)
{ {
if (memcmp(mpc->mpc_signature, MPC_SIGNATURE, 4)) { if (memcmp(mpc->mpc_signature, MPC_SIGNATURE, 4)) {
@ -283,7 +282,7 @@ static int __init smp_check_mpc(struct mp_config_table *mpc, char *oem,
return 1; return 1;
} }
static int __init smp_read_mpc(struct mp_config_table *mpc, unsigned early) static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early)
{ {
char str[16]; char str[16];
char oem[10]; char oem[10];
@ -843,7 +842,7 @@ static int __init get_MP_intsrc_index(struct mpc_config_intsrc *m)
static struct mpc_config_intsrc __initdata *m_spare[SPARE_SLOT_NUM]; static struct mpc_config_intsrc __initdata *m_spare[SPARE_SLOT_NUM];
#endif #endif
static int __init replace_intsrc_all(struct mp_config_table *mpc, static int __init replace_intsrc_all(struct mpc_table *mpc,
unsigned long mpc_new_phys, unsigned long mpc_new_phys,
unsigned long mpc_new_length) unsigned long mpc_new_length)
{ {
@ -1014,8 +1013,7 @@ static int __init update_mp_table(void)
char str[16]; char str[16];
char oem[10]; char oem[10];
struct intel_mp_floating *mpf; struct intel_mp_floating *mpf;
struct mp_config_table *mpc; struct mpc_table *mpc, *mpc_new;
struct mp_config_table *mpc_new;
if (!enable_update_mptable) if (!enable_update_mptable)
return 0; return 0;

3
arch/x86/kernel/numaq_32.c
View File

@ -260,8 +260,7 @@ static struct x86_quirks numaq_x86_quirks __initdata = {
.update_genapic = numaq_update_genapic, .update_genapic = numaq_update_genapic,
}; };
void numaq_mps_oem_check(struct mp_config_table *mpc, char *oem, void numaq_mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
char *productid)
{ {
if (strncmp(oem, "IBM NUMA", 8)) if (strncmp(oem, "IBM NUMA", 8))
printk("Warning! Not a NUMA-Q system!\n"); printk("Warning! Not a NUMA-Q system!\n");

4
arch/x86/mach-generic/es7000.c
View File

@ -43,8 +43,8 @@ static void __init enable_apic_mode(void)
return; return;
} }
static __init int mps_oem_check(struct mp_config_table *mpc, char *oem, static __init int
char *productid) mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
{ {
if (mpc->mpc_oemptr) { if (mpc->mpc_oemptr) {
struct mp_config_oemtable *oem_table = struct mp_config_oemtable *oem_table =

3
arch/x86/mach-generic/numaq.c
View File

@ -19,8 +19,7 @@
#include <asm/numaq/wakecpu.h> #include <asm/numaq/wakecpu.h>
#include <asm/numaq.h> #include <asm/numaq.h>
static int mps_oem_check(struct mp_config_table *mpc, char *oem, static int mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
char *productid)
{ {
numaq_mps_oem_check(mpc, oem, productid); numaq_mps_oem_check(mpc, oem, productid);
return found_numaq; return found_numaq;

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

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