From: Li Zhong <zhong@linux.vnet.ibm.com>
To: linux-kernel@vger.kernel.org
Cc: Li Zhong <zhong@linux.vnet.ibm.com>,
fweisbec@gmail.com, paulus@samba.org, paulmck@linux.vnet.ibm.com,
linuxppc-dev@lists.ozlabs.org
Subject: [RFC PATCH 4/5] powerpc: Use the new schedule_user API on userspace preemption
Date: Fri, 1 Feb 2013 18:27:44 +0800 [thread overview]
Message-ID: <1359714465-6297-5-git-send-email-zhong@linux.vnet.ibm.com> (raw)
In-Reply-To: <1359714465-6297-1-git-send-email-zhong@linux.vnet.ibm.com>
This patch corresponds to
[PATCH] x86: Use the new schedule_user API on userspace preemption
commit 0430499ce9d78691f3985962021b16bf8f8a8048
Signed-off-by: Li Zhong <zhong@linux.vnet.ibm.com>
---
arch/powerpc/include/asm/context_tracking.h | 11 +++++++++++
arch/powerpc/kernel/entry_64.S | 3 ++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/include/asm/context_tracking.h b/arch/powerpc/include/asm/context_tracking.h
index 3adccd8..2e042ba 100644
--- a/arch/powerpc/include/asm/context_tracking.h
+++ b/arch/powerpc/include/asm/context_tracking.h
@@ -1,6 +1,7 @@
#ifndef _ASM_POWERPC_CONTEXT_TRACKING_H
#define _ASM_POWERPC_CONTEXT_TRACKING_H
+#ifndef __ASSEMBLY__
#include <linux/context_tracking.h>
#include <asm/ptrace.h>
@@ -17,4 +18,14 @@ static inline void exception_exit(struct pt_regs *regs)
#endif
}
+#else /* __ASSEMBLY__ */
+
+#ifdef CONFIG_CONTEXT_TRACKING
+#define SCHEDULE_USER bl .schedule_user
+#else
+#define SCHEDULE_USER bl .schedule
+#endif
+
+#endif /* !__ASSEMBLY__ */
+
#endif
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index 3d990d3..91f09ec 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -33,6 +33,7 @@
#include <asm/irqflags.h>
#include <asm/ftrace.h>
#include <asm/hw_irq.h>
+#include <asm/context_tracking.h>
/*
* System calls.
@@ -595,7 +596,7 @@ _GLOBAL(ret_from_except_lite)
andi. r0,r4,_TIF_NEED_RESCHED
beq 1f
bl .restore_interrupts
- bl .schedule
+ SCHEDULE_USER
b .ret_from_except_lite
1: bl .save_nvgprs
--
1.7.9.5
next prev parent reply other threads:[~2013-02-01 10:28 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-01 10:27 [RFC PATCH 0/5] powerpc: Support context tracking for Power pSeries Li Zhong
2013-02-01 10:27 ` [RFC PATCH 1/5] powerpc: Syscall hooks for context tracking subsystem Li Zhong
2013-02-07 0:29 ` Frederic Weisbecker
2013-02-07 8:53 ` Li Zhong
2013-02-07 16:09 ` Frederic Weisbecker
2013-02-10 10:32 ` Frederic Weisbecker
2013-02-01 10:27 ` [RFC PATCH 2/5] powerpc: Exception " Li Zhong
2013-02-10 14:10 ` Frederic Weisbecker
2013-02-16 9:41 ` Li Zhong
2013-02-01 10:27 ` [RFC PATCH 3/5] powerpc: Exit user context on notify resume Li Zhong
2013-02-01 10:27 ` Li Zhong [this message]
2013-02-01 10:27 ` [RFC PATCH 5/5] powerpc: select HAVE_CONTEXT_TRACKING for pSeries Li Zhong
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=1359714465-6297-5-git-send-email-zhong@linux.vnet.ibm.com \
--to=zhong@linux.vnet.ibm.com \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=paulmck@linux.vnet.ibm.com \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).