openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove: genapic prepare 

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar 2009-02-17 14:36:42 +01:00
parent 7d01d32d3b
commit 28aa29eeb3
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/x86/include/asm/genapic.h
View File

@ -168,8 +168,6 @@ extern void apic_send_IPI_self(int vector);
extern struct genapic apic_x2apic_uv_x; extern struct genapic apic_x2apic_uv_x;
DECLARE_PER_CPU(int, x2apic_extra_bits); DECLARE_PER_CPU(int, x2apic_extra_bits);
extern void default_setup_apic_routing(void);
extern int default_cpu_present_to_apicid(int mps_cpu); extern int default_cpu_present_to_apicid(int mps_cpu);
extern int default_check_phys_apicid_present(int boot_cpu_physical_apicid); extern int default_check_phys_apicid_present(int boot_cpu_physical_apicid);
#endif #endif
@ -211,10 +209,9 @@ static inline unsigned int read_apic_id(void)
return apic->get_apic_id(reg); return apic->get_apic_id(reg);
} }
#ifdef CONFIG_X86_64
extern void default_setup_apic_routing(void); extern void default_setup_apic_routing(void);
#else
#ifdef CONFIG_X86_32
/* /*
* Set up the logical destination ID. * Set up the logical destination ID.
* *
@ -251,14 +248,6 @@ static inline int default_phys_pkg_id(int cpuid_apic, int index_msb)
return cpuid_apic >> index_msb; return cpuid_apic >> index_msb;
} }
static inline void default_setup_apic_routing(void)
{
#ifdef CONFIG_X86_IO_APIC
printk("Enabling APIC mode: %s. Using %d I/O APICs\n",
"Flat", nr_ioapics);
#endif
}
extern int default_apicid_to_node(int logical_apicid); extern int default_apicid_to_node(int logical_apicid);
#endif #endif

9
arch/x86/kernel/probe_32.c
View File

@ -53,6 +53,15 @@ int no_broadcast = DEFAULT_SEND_IPI;
#ifdef CONFIG_X86_LOCAL_APIC #ifdef CONFIG_X86_LOCAL_APIC
void default_setup_apic_routing(void)
{
#ifdef CONFIG_X86_IO_APIC
printk(KERN_INFO
"Enabling APIC mode: Flat. Using %d I/O APICs\n",
nr_ioapics);
#endif
}
static void default_vector_allocation_domain(int cpu, struct cpumask *retmask) static void default_vector_allocation_domain(int cpu, struct cpumask *retmask)
{ {
/* /*