diff options
author | 2024-11-05 09:36:29 +0100 | |
---|---|---|
committer | 2024-11-05 09:36:29 +0100 | |
commit | 9365f0de4303f82ed4c2db1c39d3de824b249d80 (patch) | |
tree | 2429440aa61c31608557adae2d8fd9228dee7622 /include/linux/compiler-gcc.h | |
parent | char: Switch back to struct platform_driver::remove() (diff) | |
parent | Linux 6.12-rc6 (diff) | |
download | wireguard-linux-9365f0de4303f82ed4c2db1c39d3de824b249d80.tar.xz wireguard-linux-9365f0de4303f82ed4c2db1c39d3de824b249d80.zip |
Merge 6.12-rc6 into char-misc-next
We need the char/misc/iio fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/compiler-gcc.h')
-rw-r--r-- | include/linux/compiler-gcc.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h index f805adaa316e..cd6f9aae311f 100644 --- a/include/linux/compiler-gcc.h +++ b/include/linux/compiler-gcc.h @@ -80,7 +80,11 @@ #define __noscs __attribute__((__no_sanitize__("shadow-call-stack"))) #endif +#ifdef __SANITIZE_HWADDRESS__ +#define __no_sanitize_address __attribute__((__no_sanitize__("hwaddress"))) +#else #define __no_sanitize_address __attribute__((__no_sanitize_address__)) +#endif #if defined(__SANITIZE_THREAD__) #define __no_sanitize_thread __attribute__((__no_sanitize_thread__)) |