Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sh: Follow gUSA preempt changes in __switch_to().

Browse source 
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Paul Mundt 2007-09-28 15:48:06 +09:00
parent e5137682a1
commit 995bb781d4
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/sh/kernel/process.c
View file

@ -19,6 +19,7 @@
#include <linux/tick.h> #include <linux/tick.h>
#include <linux/reboot.h> #include <linux/reboot.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/preempt.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/mmu_context.h> #include <asm/mmu_context.h>
#include <asm/pgalloc.h> #include <asm/pgalloc.h>
@ -351,10 +352,9 @@ struct task_struct *__switch_to(struct task_struct *prev,
#ifdef CONFIG_PREEMPT #ifdef CONFIG_PREEMPT
{ {
unsigned long flags;
struct pt_regs *regs; struct pt_regs *regs;
local_irq_save(flags); preempt_disable();
regs = task_pt_regs(prev); regs = task_pt_regs(prev);
if (user_mode(regs) && regs->regs[15] >= 0xc0000000) { if (user_mode(regs) && regs->regs[15] >= 0xc0000000) {
int offset = (int)regs->regs[15]; int offset = (int)regs->regs[15];
@ -365,7 +365,7 @@ struct task_struct *__switch_to(struct task_struct *prev,
/* Go to rewind point */ /* Go to rewind point */
regs->pc = regs->regs[0] + offset; regs->pc = regs->regs[0] + offset;
} }
local_irq_restore(flags); preempt_enable_no_resched();
} }
#endif #endif