summaryrefslogtreecommitdiffstats
path: root/arch/s390/include
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2016-11-14 14:28:51 +0100
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2016-11-23 16:02:19 +0100
commit56e9219a8248321b71199ca3b0279e07d23d3576 (patch)
tree6117da21ca85981de274db89803909e220f7a511 /arch/s390/include
parenta95aeb2ff4a99dded0cfa4bec4ee61aaeb8b5109 (diff)
downloadlinux-stable-56e9219a8248321b71199ca3b0279e07d23d3576.tar.gz
linux-stable-56e9219a8248321b71199ca3b0279e07d23d3576.tar.bz2
linux-stable-56e9219a8248321b71199ca3b0279e07d23d3576.zip
s390/uaccess: make setfs macro return void
For an unknown (historic) reason the s390 specific implementation of set_fs returns whatever the __ctl_load would return. The set_fs macro however is supposed to return void. Change the macro to do that. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/include')
-rw-r--r--arch/s390/include/asm/uaccess.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h
index 52d7c8709279..f82b04e85a21 100644
--- a/arch/s390/include/asm/uaccess.h
+++ b/arch/s390/include/asm/uaccess.h
@@ -37,14 +37,14 @@
#define get_ds() (KERNEL_DS)
#define get_fs() (current->thread.mm_segment)
-#define set_fs(x) \
-({ \
+#define set_fs(x) \
+{ \
unsigned long __pto; \
current->thread.mm_segment = (x); \
__pto = current->thread.mm_segment.ar4 ? \
S390_lowcore.user_asce : S390_lowcore.kernel_asce; \
__ctl_load(__pto, 7, 7); \
-})
+}
#define segment_eq(a,b) ((a).ar4 == (b).ar4)