diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2014-06-02 14:53:57 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2014-06-10 10:48:28 +0200 |
| commit | f8b13505607823bb9a212eb9410669ecf2bc2615 (patch) | |
| tree | f7f02832e582cda3afa8ef9aabc3145b25620f94 /arch/s390/include/asm/switch_to.h | |
| parent | c1a42f49b20e9498c7abd47c01b04c6312af13c4 (diff) | |
| download | blackbird-op-linux-f8b13505607823bb9a212eb9410669ecf2bc2615.tar.gz blackbird-op-linux-f8b13505607823bb9a212eb9410669ecf2bc2615.zip | |
s390/uaccess: always load the kernel ASCE after task switch
This patch fixes a problem introduced with git commit beef560b4cdfafb2
"s390/uaccess: simplify control register updates".
The switch_mm function is not called if the next process is a kernel
thread without an attached mm or is a nop if the mm does not change.
But CR1 still needs to be loaded with the kernel ASCE in case the
code returns to a uaccess function that uses the secondary space mode.
In addition move the set_fs call from finish_arch_switch to
finish_arch_post_lock_switch and then remove finish_arch_switch.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/include/asm/switch_to.h')
| -rw-r--r-- | arch/s390/include/asm/switch_to.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/s390/include/asm/switch_to.h b/arch/s390/include/asm/switch_to.h index 29c81f82705e..df38c70cd59e 100644 --- a/arch/s390/include/asm/switch_to.h +++ b/arch/s390/include/asm/switch_to.h @@ -134,8 +134,4 @@ static inline void restore_access_regs(unsigned int *acrs) prev = __switch_to(prev,next); \ } while (0) -#define finish_arch_switch(prev) do { \ - set_fs(current->thread.mm_segment); \ -} while (0) - #endif /* __ASM_SWITCH_TO_H */ |
