summaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel/smp.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-08-07 06:43:17 -0400
committerJeff Garzik <jeff@garzik.org>2006-08-07 06:43:17 -0400
commit38ebb1e0ed214efe124534eba4a34e869a0d8da7 (patch)
tree3712611527654e81109d194d903401c86763e3f4 /arch/x86_64/kernel/smp.c
parent236a686b56428a8967a057a2396f9be74e2ee652 (diff)
parent9f737633e6ee54fc174282d49b2559bd2208391d (diff)
downloadop-kernel-dev-38ebb1e0ed214efe124534eba4a34e869a0d8da7.zip
op-kernel-dev-38ebb1e0ed214efe124534eba4a34e869a0d8da7.tar.gz
Merge branch 'master' into upstream
Diffstat (limited to 'arch/x86_64/kernel/smp.c')
-rw-r--r--arch/x86_64/kernel/smp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/smp.c b/arch/x86_64/kernel/smp.c
index 5a1c0a3..06af6ca 100644
--- a/arch/x86_64/kernel/smp.c
+++ b/arch/x86_64/kernel/smp.c
@@ -203,7 +203,7 @@ int __cpuinit init_smp_flush(void)
{
int i;
for_each_cpu_mask(i, cpu_possible_map) {
- spin_lock_init(&per_cpu(flush_state.tlbstate_lock, i));
+ spin_lock_init(&per_cpu(flush_state, i).tlbstate_lock);
}
return 0;
}
OpenPOWER on IntegriCloud