From 7868345eb3b6e8cbb59c30b85d07965c61f1997b Mon Sep 17 00:00:00 2001 From: Daniel Hellstrom Date: Thu, 9 Jun 2011 02:54:08 +0000 Subject: [PATCH] --- yaml --- r: 253371 b: refs/heads/master c: a7d82a0a3cd547494294baee7f9764ea44bead73 h: refs/heads/master i: 253369: 5aef9922850bc43720297ca4408a3b9c4402d5f1 253367: bb50b2e51b0ff81001ec4fb3de19b4f01049c44c v: v3 --- [refs] | 2 +- trunk/arch/sparc/kernel/entry.S | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ae2dcced73e2..ed6c1ef9f511 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6cb79b3f3ba2b14590cac02ee13ab7410b6225ed +refs/heads/master: a7d82a0a3cd547494294baee7f9764ea44bead73 diff --git a/trunk/arch/sparc/kernel/entry.S b/trunk/arch/sparc/kernel/entry.S index c4e616711348..9fe08a1ea6c6 100644 --- a/trunk/arch/sparc/kernel/entry.S +++ b/trunk/arch/sparc/kernel/entry.S @@ -229,7 +229,7 @@ real_irq_entry: #ifdef CONFIG_SMP .globl patchme_maybe_smp_msg - cmp %l7, 12 + cmp %l7, 11 patchme_maybe_smp_msg: bgu maybe_smp4m_msg nop @@ -293,7 +293,7 @@ maybe_smp4m_msg: WRITE_PAUSE wr %l4, PSR_ET, %psr WRITE_PAUSE - sll %o2, 28, %o2 ! shift for simpler checks below + sll %o3, 28, %o2 ! shift for simpler checks below maybe_smp4m_msg_check_single: andcc %o2, 0x1, %g0 beq,a maybe_smp4m_msg_check_mask