From: Heiko Carstens Date: Mon, 13 Jun 2016 08:17:20 +0000 (+0200) Subject: s390/uaccess: use __builtin_expect for get_user/put_user X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ee64baf4ea3b7affb7e325bb3d188515ec4bb66e;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git s390/uaccess: use __builtin_expect for get_user/put_user We always expect that get_user and put_user return with zero. Give the compiler a hint so it can slightly optimize the code and avoid branches. This is the same what x86 got with commit a76cf66e948a ("x86/uaccess: Tell the compiler that uaccess is unlikely to fault"). Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky --- diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h index e0900ddf91dd..2ea7f3208cd2 100644 --- a/arch/s390/include/asm/uaccess.h +++ b/arch/s390/include/asm/uaccess.h @@ -191,7 +191,7 @@ static inline int __get_user_fn(void *x, const void __user *ptr, unsigned long s __put_user_bad(); \ break; \ } \ - __pu_err; \ + __builtin_expect(__pu_err, 0); \ }) #define put_user(x, ptr) \ @@ -240,7 +240,7 @@ int __put_user_bad(void) __attribute__((noreturn)); __get_user_bad(); \ break; \ } \ - __gu_err; \ + __builtin_expect(__gu_err, 0); \ }) #define get_user(x, ptr) \