diff options
| author |   Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2024-06-10 12:03:21 +0100 |
|---|---|---|
| committer | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2024-06-10 12:03:21 +0100 |
| commit | 594ce0b8a998aa4d05827cd7c0d0dcec9a1e3ae2 (patch) | |
| tree | 070bd60a8fda15e5f47339d3f6888a0fe2ca6fe9 /include/linux/compiler-gcc.h | |
| parent | clkdev: don't fail clkdev_alloc() if over-sized (diff) | |
| parent | ARM: 9405/1: ftrace: Don't assume stack frames are contiguous in memory (diff) | |
| download | wireguard-linux-594ce0b8a998aa4d05827cd7c0d0dcec9a1e3ae2.tar.xz wireguard-linux-594ce0b8a998aa4d05827cd7c0d0dcec9a1e3ae2.zip | |
Merge topic branches 'clkdev' and 'fixes' into for-linus
Diffstat (limited to 'include/linux/compiler-gcc.h')
| -rw-r--r-- | include/linux/compiler-gcc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h index 75bd1692d2e3..aff92b1d284f 100644 --- a/include/linux/compiler-gcc.h +++ b/include/linux/compiler-gcc.h @@ -35,7 +35,7 @@ (typeof(ptr)) (__ptr + (off)); \ }) -#ifdef CONFIG_RETPOLINE +#ifdef CONFIG_MITIGATION_RETPOLINE #define __noretpoline __attribute__((__indirect_branch__("keep"))) #endif |