diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-10-07 13:04:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-10-07 13:04:44 -0700 |
| commit | a8cdf51cda30f7461a98af821e8a28c5cb5f8878 (patch) | |
| tree | 6f309472a0deec4110e29d8778ab24e8cc7d2423 /tools | |
| parent | 16d1ba7c9675ee16e0f7fb22d51cd2898aab625d (diff) | |
| parent | b157dd228cf0ee24b2414712abd82bd3a8d5b009 (diff) | |
Merge tag 'hardening-fix1-v6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull hardening fixes from Kees Cook:
- tools headers: rename missed CONFIG_CFI_CLANG in merge (Carlos
Llamas)
- kconfig: Avoid prompting for transitional symbols
* tag 'hardening-fix1-v6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
tools headers: kcfi: rename missed CONFIG_CFI_CLANG
kconfig: Avoid prompting for transitional symbols
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/include/linux/cfi_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/include/linux/cfi_types.h b/tools/include/linux/cfi_types.h index fb8d90bff92e..a86af9bc8bdc 100644 --- a/tools/include/linux/cfi_types.h +++ b/tools/include/linux/cfi_types.h @@ -43,7 +43,7 @@ #else /* __ASSEMBLY__ */ -#ifdef CONFIG_CFI_CLANG +#ifdef CONFIG_CFI #define DEFINE_CFI_TYPE(name, func) \ /* \ * Force a reference to the function so the compiler generates \ |