Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

remove: genapic prepare

Signed-off-by: Ingo Molnar <mingo@elte.hu>

+10 -12
+1 -12
arch/x86/include/asm/genapic.h
··· 168 168 extern struct genapic apic_x2apic_uv_x; 169 169 DECLARE_PER_CPU(int, x2apic_extra_bits); 170 170 171 - extern void default_setup_apic_routing(void); 172 - 173 171 extern int default_cpu_present_to_apicid(int mps_cpu); 174 172 extern int default_check_phys_apicid_present(int boot_cpu_physical_apicid); 175 173 #endif ··· 209 211 return apic->get_apic_id(reg); 210 212 } 211 213 212 - #ifdef CONFIG_X86_64 213 214 extern void default_setup_apic_routing(void); 214 - #else 215 215 216 + #ifdef CONFIG_X86_32 216 217 /* 217 218 * Set up the logical destination ID. 218 219 * ··· 246 249 static inline int default_phys_pkg_id(int cpuid_apic, int index_msb) 247 250 { 248 251 return cpuid_apic >> index_msb; 249 - } 250 - 251 - static inline void default_setup_apic_routing(void) 252 - { 253 - #ifdef CONFIG_X86_IO_APIC 254 - printk("Enabling APIC mode: %s. Using %d I/O APICs\n", 255 - "Flat", nr_ioapics); 256 - #endif 257 252 } 258 253 259 254 extern int default_apicid_to_node(int logical_apicid);
+9
arch/x86/kernel/probe_32.c
··· 53 53 54 54 #ifdef CONFIG_X86_LOCAL_APIC 55 55 56 + void default_setup_apic_routing(void) 57 + { 58 + #ifdef CONFIG_X86_IO_APIC 59 + printk(KERN_INFO 60 + "Enabling APIC mode: Flat. Using %d I/O APICs\n", 61 + nr_ioapics); 62 + #endif 63 + } 64 + 56 65 static void default_vector_allocation_domain(int cpu, struct cpumask *retmask) 57 66 { 58 67 /*