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

Commit 00fb8606 authored by Jaswinder Singh Rajput's avatar Jaswinder Singh Rajput Committed by Ingo Molnar
Browse files

x86: rename mpc_config_bus to mpc_bus 



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: default avatarJaswinder Singh Rajput <jaswinderrajput@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent f29521e4

arch/x86/include/asm/genapic_32.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 * Copyright 2003 Andi Kleen, SuSE Labs.

 */



struct mpc_config_bus;

struct mpc_bus;

struct mpc_table;

struct mpc_config_processor;

arch/x86/include/asm/mpspec_def.h

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ struct mpc_config_processor { 
	unsigned int mpc_reserved[2];

};



struct mpc_config_bus {

struct mpc_bus {

	unsigned char mpc_type;

	unsigned char mpc_busid;

	unsigned char mpc_bustype[6];

arch/x86/include/asm/setup.h

+3 −3
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ extern int wakeup_secondary_cpu_via_init(int apicid, unsigned long start_eip); 
 * Any setup quirks to be performed?

 */

struct mpc_config_processor;

struct mpc_config_bus;

struct mpc_bus;

struct mp_config_oemtable;

struct x86_quirks {

	int (*arch_pre_time_init)(void);
@@ -40,8 +40,8 @@ struct x86_quirks { 


	int *mpc_record;

	int (*mpc_apic_id)(struct mpc_config_processor *m);

	void (*mpc_oem_bus_info)(struct mpc_config_bus *m, char *name);

	void (*mpc_oem_pci_bus)(struct mpc_config_bus *m);

	void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name);

	void (*mpc_oem_pci_bus)(struct mpc_bus *m);

	void (*smp_read_mpc_oem)(struct mp_config_oemtable *oemtable,

                                    unsigned short oemsize);

	int (*setup_ioapic_ids)(void);

arch/x86/kernel/mpparse.c

+5 −7
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static void __init MP_processor_info(struct mpc_config_processor *m) 
}



#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];

	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:

			{

				struct mpc_config_bus *m =

				    (struct mpc_config_bus *)mpt;

				struct mpc_bus *m = (struct mpc_bus *)mpt;

#ifdef CONFIG_X86_IO_APIC

				MP_bus_info(m);

#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)

{

	struct mpc_config_ioapic ioapic;

	struct mpc_config_bus bus;

	struct mpc_bus bus;



	bus.mpc_type = MP_BUS;

	bus.mpc_busid = 0;
@@ -656,7 +655,7 @@ static void __init __get_smp_config(unsigned int early) 
		 * ISA defaults and hope it will work.

		 */

		if (!mp_irq_entries) {

			struct mpc_config_bus bus;

			struct mpc_bus bus;



			printk(KERN_ERR "BIOS bug, no explicit IRQ entries, "

			       "using default mptable. "
@@ -867,8 +866,7 @@ static int __init replace_intsrc_all(struct mpc_table *mpc, 
			}

		case MP_BUS:

			{

				struct mpc_config_bus *m =

				    (struct mpc_config_bus *)mpt;

				struct mpc_bus *m = (struct mpc_bus *)mpt;

				mpt += sizeof(*m);

				count += sizeof(*m);

				break;

arch/x86/kernel/numaq_32.c

+2 −2
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ int mp_bus_id_to_node[MAX_MP_BUSSES]; 
int mp_bus_id_to_local[MAX_MP_BUSSES];



/* 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 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];



/* 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 local = translation_table[mpc_record]->trans_local;