diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-21 10:48:31 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-05-21 10:48:31 +0300 |
commit | 03e3e31ee5c8d45c62c31035578bab5e90133eff (patch) | |
tree | 5cff3fda5bb8278621c27823f52b7e8dd85fb0ef /include/linux/randomize_kstack.h | |
parent | 3ce3e45cc333da707d4d6eb433574b990bcc26f5 (diff) | |
parent | 50f09a3dd5877bda888fc25c3d98937dcfb85539 (diff) | |
download | linux-03e3e31ee5c8d45c62c31035578bab5e90133eff.tar.xz |
Merge 50f09a3dd587 ("Merge tag 'char-misc-5.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc") into char-misc-next
We want the char/misc driver fixes in here as well
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/randomize_kstack.h')
-rw-r--r-- | include/linux/randomize_kstack.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/randomize_kstack.h b/include/linux/randomize_kstack.h index fd80fab663a9..bebc911161b6 100644 --- a/include/linux/randomize_kstack.h +++ b/include/linux/randomize_kstack.h @@ -38,7 +38,7 @@ void *__builtin_alloca(size_t size); u32 offset = raw_cpu_read(kstack_offset); \ u8 *ptr = __builtin_alloca(KSTACK_OFFSET_MAX(offset)); \ /* Keep allocation even after "ptr" loses scope. */ \ - asm volatile("" : "=o"(*ptr) :: "memory"); \ + asm volatile("" :: "r"(ptr) : "memory"); \ } \ } while (0) |