]> git.karo-electronics.de Git - linux-beck.git/commitdiff
s390/uaccess: make setfs macro return void
authorHeiko Carstens <heiko.carstens@de.ibm.com>
Mon, 14 Nov 2016 13:28:51 +0000 (14:28 +0100)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Wed, 23 Nov 2016 15:02:19 +0000 (16:02 +0100)
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>
arch/s390/include/asm/uaccess.h

index 52d7c8709279fcd937add7062ac62910ce40fdcf..f82b04e85a210fa9bfda37a917c172141a9eca4e 100644 (file)
 #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)