projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge ../linux-2.6/
[powerpc.git]
/
arch
/
x86_64
/
kernel
/
smp.c
diff --git
a/arch/x86_64/kernel/smp.c
b/arch/x86_64/kernel/smp.c
index
8188bae
..
5a1c0a3
100644
(file)
--- a/
arch/x86_64/kernel/smp.c
+++ b/
arch/x86_64/kernel/smp.c
@@
-135,10
+135,10
@@
asmlinkage void smp_invalidate_interrupt(struct pt_regs *regs)
cpu = smp_processor_id();
/*
cpu = smp_processor_id();
/*
- * orig_rax contains the
interrupt vector - 256
.
+ * orig_rax contains the
negated interrupt vector
.
* Use that to determine where the sender put the data.
*/
* Use that to determine where the sender put the data.
*/
- sender =
regs->orig_rax + 256
- INVALIDATE_TLB_VECTOR_START;
+ sender =
~regs->orig_rax
- INVALIDATE_TLB_VECTOR_START;
f = &per_cpu(flush_state, sender);
if (!cpu_isset(cpu, f->flush_cpumask))
f = &per_cpu(flush_state, sender);
if (!cpu_isset(cpu, f->flush_cpumask))
@@
-474,7
+474,7
@@
void smp_send_stop(void)
return;
/* Don't deadlock on the call lock in panic */
if (!spin_trylock(&call_lock)) {
return;
/* Don't deadlock on the call lock in panic */
if (!spin_trylock(&call_lock)) {
- /* ignore locking because we have paniced anyways */
+ /* ignore locking because we have panic
k
ed anyways */
nolock = 1;
}
__smp_call_function(smp_really_stop_cpu, NULL, 0, 0);
nolock = 1;
}
__smp_call_function(smp_really_stop_cpu, NULL, 0, 0);