diff options
author | Li Zhong <zhong@linux.vnet.ibm.com> | 2013-05-13 12:16:43 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-05-14 02:00:20 -0400 |
commit | 5d1c57451154047ab31aadfbc712bb8aa174bfb3 (patch) | |
tree | a2a3e7c7aae755944b3898cd420e8396423762a6 /arch/powerpc/kernel | |
parent | 106ed886abc46723c290e82e5f161d9b40820203 (diff) |
powerpc: Use the new schedule_user API on userspace preemption
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>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/kernel')
-rw-r--r-- | arch/powerpc/kernel/entry_64.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S index 48e8a86e7cb2..794889b588cd 100644 --- a/arch/powerpc/kernel/entry_64.S +++ b/arch/powerpc/kernel/entry_64.S | |||
@@ -33,6 +33,7 @@ | |||
33 | #include <asm/irqflags.h> | 33 | #include <asm/irqflags.h> |
34 | #include <asm/ftrace.h> | 34 | #include <asm/ftrace.h> |
35 | #include <asm/hw_irq.h> | 35 | #include <asm/hw_irq.h> |
36 | #include <asm/context_tracking.h> | ||
36 | 37 | ||
37 | /* | 38 | /* |
38 | * System calls. | 39 | * System calls. |
@@ -632,7 +633,7 @@ _GLOBAL(ret_from_except_lite) | |||
632 | andi. r0,r4,_TIF_NEED_RESCHED | 633 | andi. r0,r4,_TIF_NEED_RESCHED |
633 | beq 1f | 634 | beq 1f |
634 | bl .restore_interrupts | 635 | bl .restore_interrupts |
635 | bl .schedule | 636 | SCHEDULE_USER |
636 | b .ret_from_except_lite | 637 | b .ret_from_except_lite |
637 | 638 | ||
638 | 1: bl .save_nvgprs | 639 | 1: bl .save_nvgprs |