From ec4bb0097aa8dc6d1f186b877337c1c23f56644e Mon Sep 17 00:00:00 2001 From: Mathias Krause Date: Tue, 26 Jul 2011 16:08:15 -0700 Subject: [PATCH] --- yaml --- r: 260390 b: refs/heads/master c: adc400f69053b16756ff3b00daa64884c8df0787 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/frv/include/asm/processor.h | 1 - trunk/arch/frv/kernel/process.c | 5 +---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 8612de6eb9c9..0b8d7b5c2ef7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6fd4ce886440c7a1b08b6642e606ee19097829df +refs/heads/master: adc400f69053b16756ff3b00daa64884c8df0787 diff --git a/trunk/arch/frv/include/asm/processor.h b/trunk/arch/frv/include/asm/processor.h index 4b789ab182b0..81c2e271d620 100644 --- a/trunk/arch/frv/include/asm/processor.h +++ b/trunk/arch/frv/include/asm/processor.h @@ -97,7 +97,6 @@ extern struct task_struct *__kernel_current_task; */ #define start_thread(_regs, _pc, _usp) \ do { \ - set_fs(USER_DS); /* reads from user space */ \ __frame = __kernel_frame0_ptr; \ __frame->pc = (_pc); \ __frame->psr &= ~PSR_S; \ diff --git a/trunk/arch/frv/kernel/process.c b/trunk/arch/frv/kernel/process.c index 9d3597526467..3901df1213c0 100644 --- a/trunk/arch/frv/kernel/process.c +++ b/trunk/arch/frv/kernel/process.c @@ -143,10 +143,7 @@ void machine_power_off(void) void flush_thread(void) { -#if 0 //ndef NO_FPU - unsigned long zero = 0; -#endif - set_fs(USER_DS); + /* nothing */ } inline unsigned long user_stack(const struct pt_regs *regs)