Commit eeeb35ba authored by Martin J. Bligh's avatar Martin J. Bligh Committed by Linus Torvalds

[PATCH] move one more to subarch, general tidy up

Moves check_phys_apicid_present() into subarch, and cleans up a
couple of stupid errors, and some bracketing issues in the macros.
parent cbda465e
...@@ -821,7 +821,7 @@ static int __init do_boot_cpu(int apicid) ...@@ -821,7 +821,7 @@ static int __init do_boot_cpu(int apicid)
unsigned long boot_error; unsigned long boot_error;
int timeout, cpu; int timeout, cpu;
unsigned long start_eip; unsigned long start_eip;
unsigned short nmi_high, nmi_low; unsigned short nmi_high = 0, nmi_low = 0;
cpu = ++cpucount; cpu = ++cpucount;
/* /*
...@@ -1052,8 +1052,7 @@ static void __init smp_boot_cpus(unsigned int max_cpus) ...@@ -1052,8 +1052,7 @@ static void __init smp_boot_cpus(unsigned int max_cpus)
* CPU too, but we do it for the sake of robustness anyway. * CPU too, but we do it for the sake of robustness anyway.
* Makes no sense to do this check in clustered apic mode, so skip it * Makes no sense to do this check in clustered apic mode, so skip it
*/ */
if (!clustered_apic_mode && if (!check_phys_apicid_present(boot_cpu_physical_apicid)) {
!test_bit(boot_cpu_physical_apicid, &phys_cpu_present_map)) {
printk("weird, boot CPU (#%d) not listed by the BIOS.\n", printk("weird, boot CPU (#%d) not listed by the BIOS.\n",
boot_cpu_physical_apicid); boot_cpu_physical_apicid);
phys_cpu_present_map |= (1 << hard_smp_processor_id()); phys_cpu_present_map |= (1 << hard_smp_processor_id());
......
...@@ -84,4 +84,9 @@ static inline void setup_portio_remap(void) ...@@ -84,4 +84,9 @@ static inline void setup_portio_remap(void)
{ {
} }
static inline int check_phys_apicid_present(int boot_cpu_physical_apicid)
{
return test_bit(boot_cpu_physical_apicid, &phys_cpu_present_map);
}
#endif /* __ASM_MACH_APIC_H */ #endif /* __ASM_MACH_APIC_H */
#ifndef __ASM_MACH_APIC_H #ifndef __ASM_MACH_APIC_H
#define __ASM_MACH_APIC_H #define __ASM_MACH_APIC_H
#define APIC_DFR_VALUE (APIC_DFR_FLAT) #define APIC_DFR_VALUE (APIC_DFR_CLUSTER)
#define TARGET_CPUS (0xf) #define TARGET_CPUS (0xf)
#define no_balance_irq (1) #define no_balance_irq (1)
#define APIC_BROADCAST_ID 0x0F #define APIC_BROADCAST_ID 0x0F
#define check_apicid_used(bitmap, apicid) (bitmap & (1 << apicid)) #define check_apicid_used(bitmap, apicid) ((bitmap) & (1 << (apicid)))
static inline int apic_id_registered(void) static inline int apic_id_registered(void)
{ {
...@@ -26,6 +26,10 @@ static inline void clustered_apic_check(void) ...@@ -26,6 +26,10 @@ static inline void clustered_apic_check(void)
"NUMA-Q", nr_ioapics); "NUMA-Q", nr_ioapics);
} }
/*
* Skip adding the timer int on secondary nodes, which causes
* a small but painful rift in the time-space continuum.
*/
static inline int multi_timer_check(int apic, int irq) static inline int multi_timer_check(int apic, int irq)
{ {
return (apic != 0 && irq == 0); return (apic != 0 && irq == 0);
...@@ -82,4 +86,9 @@ static inline void setup_portio_remap(void) ...@@ -82,4 +86,9 @@ static inline void setup_portio_remap(void)
(u_long) xquad_portio, (u_long) numnodes*XQUAD_PORTIO_QUAD); (u_long) xquad_portio, (u_long) numnodes*XQUAD_PORTIO_QUAD);
} }
static inline int check_phys_apicid_present(int boot_cpu_physical_apicid)
{
return (1);
}
#endif /* __ASM_MACH_APIC_H */ #endif /* __ASM_MACH_APIC_H */
...@@ -65,4 +65,9 @@ static inline void setup_portio_remap(void) ...@@ -65,4 +65,9 @@ static inline void setup_portio_remap(void)
{ {
} }
static inline int check_phys_apicid_present(int boot_cpu_physical_apicid)
{
return (1);
}
#endif /* __ASM_MACH_APIC_H */ #endif /* __ASM_MACH_APIC_H */
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#endif #endif
#endif #endif
#ifdef CONFIG_CLUSTERED_APIC #ifdef CONFIG_X86_NUMAQ
#define INT_DELIVERY_MODE 0 /* physical delivery on LOCAL quad */ #define INT_DELIVERY_MODE 0 /* physical delivery on LOCAL quad */
#else #else
#define INT_DELIVERY_MODE 1 /* logical delivery broadcast to all procs */ #define INT_DELIVERY_MODE 1 /* logical delivery broadcast to all procs */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment