Skip to content

Commit

Permalink
m68k, exec: remove redundant set_fs(USER_DS)
Browse files Browse the repository at this point in the history
The address limit is already set in flush_old_exec() so those calls to
set_fs(USER_DS) are redundant.

Signed-off-by: Mathias Krause <minipli@googlemail.com>
Cc: Greg Ungerer <gerg@uclinux.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Mathias Krause authored and Linus Torvalds committed Jul 26, 2011
1 parent f796062 commit b7de110
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 6 deletions.
4 changes: 0 additions & 4 deletions arch/m68k/include/asm/processor.h
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,6 @@ struct thread_struct {
static inline void start_thread(struct pt_regs * regs, unsigned long pc,
unsigned long usp)
{
/* reads from user space */
set_fs(USER_DS);

regs->pc = pc;
regs->sr &= ~0x2000;
wrusp(usp);
Expand All @@ -129,7 +126,6 @@ extern int handle_kernel_fault(struct pt_regs *regs);

#define start_thread(_regs, _pc, _usp) \
do { \
set_fs(USER_DS); /* reads from user space */ \
(_regs)->pc = (_pc); \
((struct switch_stack *)(_regs))[-1].a6 = 0; \
reformat(_regs); \
Expand Down
2 changes: 1 addition & 1 deletion arch/m68k/kernel/process_mm.c
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ EXPORT_SYMBOL(kernel_thread);
void flush_thread(void)
{
unsigned long zero = 0;
set_fs(USER_DS);

current->thread.fs = __USER_DS;
if (!FPU_IS_EMU)
asm volatile (".chip 68k/68881\n\t"
Expand Down
2 changes: 1 addition & 1 deletion arch/m68k/kernel/process_no.c
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ void flush_thread(void)
#ifdef CONFIG_FPU
unsigned long zero = 0;
#endif
set_fs(USER_DS);

current->thread.fs = __USER_DS;
#ifdef CONFIG_FPU
if (!FPU_IS_EMU)
Expand Down

0 comments on commit b7de110

Please sign in to comment.