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

Commit 86420506 authored by Alexey Starikovskiy's avatar Alexey Starikovskiy Committed by Ingo Molnar
Browse files

x86: make struct mpc_config_translation NUMAQ-only 



Signed-off-by: default avatarAlexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 0ec153af

arch/x86/kernel/mpparse_32.c

+6 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ static int __init mpf_checksum(unsigned char *mp, int len) 
	return sum & 0xFF;

}



#ifdef CONFIG_X86_NUMAQ

/*

 * Have to match translation table entries to main table entries by counter

 * hence the mpc_record variable .... can't see a less disgusting way of
@@ -106,6 +107,7 @@ static int __init mpf_checksum(unsigned char *mp, int len) 


static int mpc_record; 

static struct mpc_config_translation *translation_table[MAX_MPC_ENTRY] __cpuinitdata;

#endif



static void __cpuinit MP_processor_info (struct mpc_config_processor *m)

{
@@ -475,7 +477,9 @@ static int __init smp_read_mpc(struct mp_config_table *mpc) 
	/*

	 *	Now process the configuration blocks.

	 */

#ifdef CONFIG_X86_NUMAQ

	mpc_record = 0;

#endif

	while (count < mpc->mpc_length) {

		switch(*mpt) {

			case MP_PROCESSOR:
@@ -532,7 +536,9 @@ static int __init smp_read_mpc(struct mp_config_table *mpc) 
				break;

			}

		}

#ifdef CONFIG_X86_NUMAQ

		++mpc_record;

#endif

	}

	setup_apic_routing();

	if (!num_processors)

include/asm-x86/genapic_32.h

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

 */



struct mpc_config_translation;

struct mpc_config_bus;

struct mp_config_table;

struct mpc_config_processor;

include/asm-x86/mach-numaq/mach_apic.h

+10 −0
Original line number Diff line number Diff line
@@ -95,6 +95,16 @@ static inline physid_mask_t apicid_to_cpu_present(int logical_apicid) 
	return physid_mask_of_physid(cpu + 4*node);

}



struct mpc_config_translation {

	unsigned char mpc_type;

	unsigned char trans_len;

	unsigned char trans_type;

	unsigned char trans_quad;

	unsigned char trans_global;

	unsigned char trans_local;

	unsigned short trans_reserved;

};



static inline int mpc_apic_id(struct mpc_config_processor *m, 

			struct mpc_config_translation *translation_record)

{

include/asm-x86/mpspec_def.h

+0 −11
Original line number Diff line number Diff line
@@ -166,17 +166,6 @@ struct mp_config_oemtable 
	char  mpc_oem[8];

};



struct mpc_config_translation

{

	unsigned char mpc_type;

	unsigned char trans_len;

	unsigned char trans_type;

	unsigned char trans_quad;

	unsigned char trans_global;

	unsigned char trans_local;

	unsigned short trans_reserved;

};



/*

 *	Default configurations

 *