diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2022-03-31 11:43:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-03-31 11:43:01 -0700 |
| commit | f87cbd0565eb7e2fa15296c74210658db1346431 (patch) | |
| tree | b71ab11be7a27c741a0d7a6f32897691847e9971 /include/linux | |
| parent | Merge tag 'net-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff) | |
| parent | ARM/dma-mapping: Remove CMA code when not built with CMA (diff) | |
| download | linux-dev-f87cbd0565eb7e2fa15296c74210658db1346431.tar.xz linux-dev-f87cbd0565eb7e2fa15296c74210658db1346431.zip | |
Merge tag 'hardening-v5.18-rc1-fix1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull hardening updates from Kees Cook:
"This addresses an -Warray-bounds warning found under a few ARM
defconfigs, and disables long-broken HARDENED_USERCOPY_PAGESPAN"
* tag 'hardening-v5.18-rc1-fix1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
ARM/dma-mapping: Remove CMA code when not built with CMA
usercopy: Disable CONFIG_HARDENED_USERCOPY_PAGESPAN
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/cma.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/cma.h b/include/linux/cma.h index 90fd742fd1ef..a6f637342740 100644 --- a/include/linux/cma.h +++ b/include/linux/cma.h @@ -12,10 +12,6 @@ */ #ifdef CONFIG_CMA_AREAS #define MAX_CMA_AREAS (1 + CONFIG_CMA_AREAS) - -#else -#define MAX_CMA_AREAS (0) - #endif #define CMA_MAX_NAME 64 |