From: Linus Torvalds Date: Wed, 1 Apr 2020 01:11:18 +0000 (-0700) Subject: x86: remove __put_user_asm() infrastructure X-Git-Tag: v5.15~4199 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=ab33eb494c603bb200fbe3c3c018fc9c544487b8;p=mirror_ubuntu-kernels.git x86: remove __put_user_asm() infrastructure The last user was removed by commit 4b842e4e25b1 ("x86: get rid of small constant size cases in raw_copy_{to,from}_user()"). Get rid of the left-overs before somebody tries to use it again. Signed-off-by: Linus Torvalds --- diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h index c8247a84244b..eea2b70d8300 100644 --- a/arch/x86/include/asm/uaccess.h +++ b/arch/x86/include/asm/uaccess.h @@ -383,17 +383,6 @@ struct __large_struct { unsigned long buf[100]; }; : : ltype(x), "m" (__m(addr)) \ : : label) -#define __put_user_failed(x, addr, itype, rtype, ltype, errret) \ - ({ __label__ __puflab; \ - int __pufret = errret; \ - __put_user_goto(x,addr,itype,rtype,ltype,__puflab); \ - __pufret = 0; \ - __puflab: __pufret; }) - -#define __put_user_asm(x, addr, retval, itype, rtype, ltype, errret) do { \ - retval = __put_user_failed(x, addr, itype, rtype, ltype, errret); \ -} while (0) - /** * __get_user - Get a simple variable from user space, with less checking. * @x: Variable to store result.