system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-27 15:00:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86: rename mpc_config_bus to mpc_bus

Browse source 
Impact: cleanup, solve 80 columns wrap problems

mpc_config_bus should be renamed to mpc_bus.
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:47:32 +05:30 committed by Ingo Molnar
parent f29521e4ee
commit 00fb8606e5
5 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/x86/include/asm/genapic_32.h
View file

@ -15,7 +15,7 @@
* Copyright 2003 Andi Kleen, SuSE Labs. * Copyright 2003 Andi Kleen, SuSE Labs.
*/ */
struct mpc_config_bus; struct mpc_bus;
struct mpc_table; struct mpc_table;
struct mpc_config_processor; struct mpc_config_processor;

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

@ -80,7 +80,7 @@ struct mpc_config_processor {
unsigned int mpc_reserved[2]; unsigned int mpc_reserved[2];
}; };
struct mpc_config_bus { struct mpc_bus {
unsigned char mpc_type; unsigned char mpc_type;
unsigned char mpc_busid; unsigned char mpc_busid;
unsigned char mpc_bustype[6]; unsigned char mpc_bustype[6];

6
arch/x86/include/asm/setup.h
View file

@ -26,7 +26,7 @@ extern int wakeup_secondary_cpu_via_init(int apicid, unsigned long start_eip);
* Any setup quirks to be performed? * Any setup quirks to be performed?
*/ */
struct mpc_config_processor; struct mpc_config_processor;
struct mpc_config_bus; struct mpc_bus;
struct mp_config_oemtable; struct mp_config_oemtable;
struct x86_quirks { struct x86_quirks {
int (*arch_pre_time_init)(void); int (*arch_pre_time_init)(void);
@ -40,8 +40,8 @@ struct x86_quirks {
int *mpc_record; int *mpc_record;
int (*mpc_apic_id)(struct mpc_config_processor *m); int (*mpc_apic_id)(struct mpc_config_processor *m);
void (*mpc_oem_bus_info)(struct mpc_config_bus *m, char *name); void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name);
void (*mpc_oem_pci_bus)(struct mpc_config_bus *m); void (*mpc_oem_pci_bus)(struct mpc_bus *m);
void (*smp_read_mpc_oem)(struct mp_config_oemtable *oemtable, void (*smp_read_mpc_oem)(struct mp_config_oemtable *oemtable,
unsigned short oemsize); unsigned short oemsize);
int (*setup_ioapic_ids)(void); int (*setup_ioapic_ids)(void);

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

@ -74,7 +74,7 @@ static void __init MP_processor_info(struct mpc_config_processor *m)
} }
#ifdef CONFIG_X86_IO_APIC #ifdef CONFIG_X86_IO_APIC
static void __init MP_bus_info(struct mpc_config_bus *m) static void __init MP_bus_info(struct mpc_bus *m)
{ {
char str[7]; char str[7];
memcpy(str, m->mpc_bustype, 6); memcpy(str, m->mpc_bustype, 6);
@ -338,8 +338,7 @@ static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early)
} }
case MP_BUS: case MP_BUS:
{ {
struct mpc_config_bus *m = struct mpc_bus *m = (struct mpc_bus *)mpt;
(struct mpc_config_bus *)mpt;
#ifdef CONFIG_X86_IO_APIC #ifdef CONFIG_X86_IO_APIC
MP_bus_info(m); MP_bus_info(m);
#endif #endif
@ -488,7 +487,7 @@ static void __init construct_default_ioirq_mptable(int mpc_default_type)
static void __init construct_ioapic_table(int mpc_default_type) static void __init construct_ioapic_table(int mpc_default_type)
{ {
struct mpc_config_ioapic ioapic; struct mpc_config_ioapic ioapic;
struct mpc_config_bus bus; struct mpc_bus bus;
bus.mpc_type = MP_BUS; bus.mpc_type = MP_BUS;
bus.mpc_busid = 0; bus.mpc_busid = 0;
@ -656,7 +655,7 @@ static void __init __get_smp_config(unsigned int early)
* ISA defaults and hope it will work. * ISA defaults and hope it will work.
*/ */
if (!mp_irq_entries) { if (!mp_irq_entries) {
struct mpc_config_bus bus; struct mpc_bus bus;
printk(KERN_ERR "BIOS bug, no explicit IRQ entries, " printk(KERN_ERR "BIOS bug, no explicit IRQ entries, "
"using default mptable. " "using default mptable. "
@ -867,8 +866,7 @@ static int __init replace_intsrc_all(struct mpc_table *mpc,
} }
case MP_BUS: case MP_BUS:
{ {
struct mpc_config_bus *m = struct mpc_bus *m = (struct mpc_bus *)mpt;
(struct mpc_config_bus *)mpt;
mpt += sizeof(*m); mpt += sizeof(*m);
count += sizeof(*m); count += sizeof(*m);
break; break;

4
arch/x86/kernel/numaq_32.c
View file

@ -135,7 +135,7 @@ int mp_bus_id_to_node[MAX_MP_BUSSES];
int mp_bus_id_to_local[MAX_MP_BUSSES]; int mp_bus_id_to_local[MAX_MP_BUSSES];
/* x86_quirks member */ /* x86_quirks member */
static void mpc_oem_bus_info(struct mpc_config_bus *m, char *name) static void mpc_oem_bus_info(struct mpc_bus *m, char *name)
{ {
int quad = translation_table[mpc_record]->trans_quad; int quad = translation_table[mpc_record]->trans_quad;
int local = translation_table[mpc_record]->trans_local; int local = translation_table[mpc_record]->trans_local;
@ -149,7 +149,7 @@ static void mpc_oem_bus_info(struct mpc_config_bus *m, char *name)
int quad_local_to_mp_bus_id [NR_CPUS/4][4]; int quad_local_to_mp_bus_id [NR_CPUS/4][4];
/* x86_quirks member */ /* x86_quirks member */
static void mpc_oem_pci_bus(struct mpc_config_bus *m) static void mpc_oem_pci_bus(struct mpc_bus *m)
{ {
int quad = translation_table[mpc_record]->trans_quad; int quad = translation_table[mpc_record]->trans_quad;
int local = translation_table[mpc_record]->trans_local; int local = translation_table[mpc_record]->trans_local;