git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
x86_64
/
kernel
/
genapic_cluster.c
diff --git
a/arch/x86_64/kernel/genapic_cluster.c
b/arch/x86_64/kernel/genapic_cluster.c
index
9703da7
..
43fcf62
100644
(file)
--- a/
arch/x86_64/kernel/genapic_cluster.c
+++ b/
arch/x86_64/kernel/genapic_cluster.c
@@
-51,10
+51,10
@@
static void cluster_init_apic_ldr(void)
count = 3;
id = my_cluster | (1UL << count);
x86_cpu_to_log_apicid[smp_processor_id()] = id;
count = 3;
id = my_cluster | (1UL << count);
x86_cpu_to_log_apicid[smp_processor_id()] = id;
- apic_write
_around
(APIC_DFR, APIC_DFR_CLUSTER);
+ apic_write(APIC_DFR, APIC_DFR_CLUSTER);
val = apic_read(APIC_LDR) & ~APIC_LDR_MASK;
val |= SET_APIC_LOGICAL_ID(id);
val = apic_read(APIC_LDR) & ~APIC_LDR_MASK;
val |= SET_APIC_LOGICAL_ID(id);
- apic_write
_around
(APIC_LDR, val);
+ apic_write(APIC_LDR, val);
}
/* Start with all IRQs pointing to boot CPU. IRQ balancing will shift them. */
}
/* Start with all IRQs pointing to boot CPU. IRQ balancing will shift them. */
@@
-72,6
+72,7
@@
static void cluster_send_IPI_mask(cpumask_t mask, int vector)
static void cluster_send_IPI_allbutself(int vector)
{
cpumask_t mask = cpu_online_map;
static void cluster_send_IPI_allbutself(int vector)
{
cpumask_t mask = cpu_online_map;
+
cpu_clear(smp_processor_id(), mask);
if (!cpus_empty(mask))
cpu_clear(smp_processor_id(), mask);
if (!cpus_empty(mask))