From: Daniel Hellstrom <daniel@gaisler•com>
To: davem@davemloft•net
Cc: sparclinux@vger•kernel.org, sfr@canb•auug.org.au,
peterz@infradead•org, tglx@linutronix•de, mingo@elte•hu,
hpa@zytor•com, linux-next@vger•kernel.org,
linux-kernel@vger•kernel.org
Subject: [PATCH 1/2] Fix merge problem between sparc32 IPI patches and schedule_ipi() callback
Date: Fri, 20 May 2011 16:01:09 +0200 [thread overview]
Message-ID: <1305900070-23492-1-git-send-email-daniel@gaisler.com> (raw)
Fixes a merge conflict in arch/sparc/kernel/smp_32.c between commit
d6d048192b1d ("sparc32: implement SMP IPIs using the generic functions")
from the sparc tree and commit 184748cc50b2 ("sched: Provide
scheduler_ipi() callback in response to smp_send_reschedule()").
The patch adds a call to scheduler_ipi() from the resched IPI handler in
sparc32.
Signed-off-by: Daniel Hellstrom <daniel@gaisler•com>
---
arch/sparc/kernel/smp_32.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/sparc/kernel/smp_32.c b/arch/sparc/kernel/smp_32.c
index 41102c5..d5b3958 100644
--- a/arch/sparc/kernel/smp_32.c
+++ b/arch/sparc/kernel/smp_32.c
@@ -156,11 +156,11 @@ void arch_send_call_function_ipi_mask(const struct cpumask *mask)
void smp_resched_interrupt(void)
{
+ irq_enter();
+ scheduler_ipi();
local_cpu_data().irq_resched_count++;
- /*
- * do nothing, since it all was about calling re-schedule
- * routine called by interrupt return code.
- */
+ irq_exit();
+ /* re-schedule routine called by interrupt return code. */
}
void smp_call_function_single_interrupt(void)
--
1.6.0.3
next reply other threads:[~2011-05-20 14:02 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-20 14:01 Daniel Hellstrom [this message]
2011-05-20 14:01 ` [PATCH 2/2] SCHED_TTWU_QUEUE is not longer needed since sparc32 now implements IPI Daniel Hellstrom
2011-05-20 20:13 ` [PATCH 1/2] Fix merge problem between sparc32 IPI patches and schedule_ipi() callback David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1305900070-23492-1-git-send-email-daniel@gaisler.com \
--to=daniel@gaisler$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=peterz@infradead$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=sparclinux@vger$(echo .)kernel.org \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox