diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2021-07-04 23:05:31 -0700 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2021-07-04 23:05:31 -0700 |
commit | 818b26588994d9d95743fca0a427f08ec6c1c41d (patch) | |
tree | 870d9abed0e43b82257350a93e6517816815cd6c /mm/kasan/common.c | |
parent | 45a4b68354ffccbc9ca71027bd34754ca24f5183 (diff) | |
parent | f8f84af5da9ee04ef1d271528656dac42a090d00 (diff) | |
download | linux-818b26588994d9d95743fca0a427f08ec6c1c41d.tar.bz2 |
Merge branch 'next' into for-linus
Prepare input updates for 5.14 merge window.
Diffstat (limited to 'mm/kasan/common.c')
-rw-r--r-- | mm/kasan/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/kasan/common.c b/mm/kasan/common.c index b5e08d4cefec..7b53291dafa1 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -63,7 +63,7 @@ void __kasan_unpoison_range(const void *address, size_t size) kasan_unpoison(address, size); } -#if CONFIG_KASAN_STACK +#ifdef CONFIG_KASAN_STACK /* Unpoison the entire stack for a task. */ void kasan_unpoison_task_stack(struct task_struct *task) { |