Commit 4655c7de authored Mar 17, 2008 by Alexey Starikovskiy Committed by Ingo Molnar Apr 17, 2008

x86: remove mpc_apic_id()



Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent 555b0764

arch/x86/kernel/mpparse_32.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -118,7 +118,16 @@ static void __cpuinit MP_processor_info (struct mpc_config_processor *m)
		return;
		}

		#ifdef CONFIG_X86_NUMAQ
		apicid = mpc_apic_id(m, translation_table[mpc_record]);
		#else
		Dprintk("Processor #%d %u:%u APIC version %d\n",
		m->mpc_apicid,
		(m->mpc_cpufeature & CPU_FAMILY_MASK) >> 8,
		(m->mpc_cpufeature & CPU_MODEL_MASK) >> 4,
		m->mpc_apicver);
		apicid = m->mpc_apicid;
		#endif

		if (m->mpc_featureflag&(1<<0))
		Dprintk(" Floating point unit present.\n");

include/asm-x86/genapic_32.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -42,8 +42,6 @@ struct genapic {
		int (*cpu_to_logical_apicid)(int cpu);
		int (*cpu_present_to_apicid)(int mps_cpu);
		physid_mask_t (*apicid_to_cpu_present)(int phys_apicid);
		int (mpc_apic_id)(struct mpc_config_processor m,
		struct mpc_config_translation *t);
		void (*setup_portio_remap)(void);
		int (*check_phys_apicid_present)(int boot_cpu_physical_apicid);
		void (*enable_apic_mode)(void);
		@@ -105,7 +103,6 @@ struct genapic {
		APICFUNC(cpu_to_logical_apicid) \
		APICFUNC(cpu_present_to_apicid) \
		APICFUNC(apicid_to_cpu_present) \
		APICFUNC(mpc_apic_id) \
		APICFUNC(setup_portio_remap) \
		APICFUNC(check_phys_apicid_present) \
		APICFUNC(mpc_oem_bus_info) \

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

+0 −11

Original line number	Diff line number	Diff line
		@@ -106,17 +106,6 @@ static inline int cpu_to_logical_apicid(int cpu)
		return cpu_physical_id(cpu);
		}

		static inline int mpc_apic_id(struct mpc_config_processor *m,
		struct mpc_config_translation *translation_record)
		{
		printk("Processor #%d %u:%u APIC version %d\n",
		m->mpc_apicid,
		(m->mpc_cpufeature & CPU_FAMILY_MASK) >> 8,
		(m->mpc_cpufeature & CPU_MODEL_MASK) >> 4,
		m->mpc_apicver);
		return m->mpc_apicid;
		}

		static inline physid_mask_t ioapic_phys_id_map(physid_mask_t phys_map)
		{
		/* For clustered we don't have a good way to do this yet - hack */

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

+0 −11

Original line number	Diff line number	Diff line
		@@ -100,17 +100,6 @@ static inline physid_mask_t apicid_to_cpu_present(int phys_apicid)
		return physid_mask_of_physid(phys_apicid);
		}

		static inline int mpc_apic_id(struct mpc_config_processor *m,
		struct mpc_config_translation *translation_record)
		{
		printk("Processor #%d %u:%u APIC version %d\n",
		m->mpc_apicid,
		(m->mpc_cpufeature & CPU_FAMILY_MASK) >> 8,
		(m->mpc_cpufeature & CPU_MODEL_MASK) >> 4,
		m->mpc_apicver);
		return m->mpc_apicid;
		}

		static inline void setup_portio_remap(void)
		{
		}

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

+0 −10

Original line number	Diff line number	Diff line
		@@ -127,16 +127,6 @@ static inline int cpu_to_logical_apicid(int cpu)
		#endif
		}

		static inline int mpc_apic_id(struct mpc_config_processor m, struct mpc_config_translation unused)
		{
		printk("Processor #%d %u:%u APIC version %d\n",
		m->mpc_apicid,
		(m->mpc_cpufeature & CPU_FAMILY_MASK) >> 8,
		(m->mpc_cpufeature & CPU_MODEL_MASK) >> 4,
		m->mpc_apicver);
		return (m->mpc_apicid);
		}

		static inline physid_mask_t ioapic_phys_id_map(physid_mask_t phys_map)
		{
		/* For clustered we don't have a good way to do this yet - hack */