diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-29 19:24:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-29 19:24:33 -0700 |
| commit | 5fe858b5b76be3cb1b1cf3ea40b7ca6706f8329c (patch) | |
| tree | f9fbf8ba1b35ef2741b95b8a42d2eec9871e41cf /arch/sparc/kernel/process_32.c | |
| parent | 8e8e500fcadaf2e39f4f119ae60c289456527727 (diff) | |
| parent | f4142cba4e4065a416e78ade905bea29ff3930e6 (diff) | |
Merge git://github.com/davem330/sparc
* git://github.com/davem330/sparc:
sparc64: Force the execute bit in OpenFirmware's translation entries.
sparc: Make '-p' boot option meaningful again.
sparc, exec: remove redundant addr_limit assignment
sparc64: Future proof Niagara cpu detection.
Diffstat (limited to 'arch/sparc/kernel/process_32.c')
| -rw-r--r-- | arch/sparc/kernel/process_32.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c index c8cc461ff75..f793742eec2 100644 --- a/arch/sparc/kernel/process_32.c +++ b/arch/sparc/kernel/process_32.c @@ -380,8 +380,7 @@ void flush_thread(void) #endif } - /* Now, this task is no longer a kernel thread. */ - current->thread.current_ds = USER_DS; + /* This task is no longer a kernel thread. */ if (current->thread.flags & SPARC_FLAG_KTHREAD) { current->thread.flags &= ~SPARC_FLAG_KTHREAD; |