diff options
| author | Daniel Wagner <wagi@monom.org> | 2018-08-03 11:57:07 +0200 |
|---|---|---|
| committer | Daniel Wagner <wagi@monom.org> | 2018-08-03 11:57:07 +0200 |
| commit | 8a184ab6b65ddf4e2614399b51e9d7a8b1e3d57c (patch) | |
| tree | b189bccc00f66b179cc597ed731b5edcda4efe6b /arch/arm/include/asm/uaccess.h | |
| parent | eb6a34cce5c8974cd16601466c63840bbe04a37b (diff) | |
| parent | ac15b2b23808ee2c3264329b035a8f0f7d7f50e6 (diff) | |
| download | linux-rt-8a184ab6b65ddf4e2614399b51e9d7a8b1e3d57c.tar.gz | |
Merge tag 'v4.4.145' into v4.4-rt
This is the 4.4.145 stable release
Diffstat (limited to 'arch/arm/include/asm/uaccess.h')
| -rw-r--r-- | arch/arm/include/asm/uaccess.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h index 35c9db857ebe..cd8b589111ba 100644 --- a/arch/arm/include/asm/uaccess.h +++ b/arch/arm/include/asm/uaccess.h @@ -251,7 +251,7 @@ extern int __put_user_8(void *, unsigned long long); ({ \ unsigned long __limit = current_thread_info()->addr_limit - 1; \ const typeof(*(p)) __user *__tmp_p = (p); \ - register const typeof(*(p)) __r2 asm("r2") = (x); \ + register typeof(*(p)) __r2 asm("r2") = (x); \ register const typeof(*(p)) __user *__p asm("r0") = __tmp_p; \ register unsigned long __l asm("r1") = __limit; \ register int __e asm("r0"); \ |