diff options
| author | Linus Torvalds <[email protected]> | 2019-03-01 09:04:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2019-03-01 09:04:59 -0800 |
| commit | 2d28e01dca1a233468319517b4834783e1aaf517 (patch) | |
| tree | d057513afe10e56091011848759becd127f2efad /scripts | |
| parent | 6357c8127bea35c52085a0ae0f97e73de2419825 (diff) | |
| parent | cb6acd01e2e43fd8bad11155752b7699c3d0fb76 (diff) | |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"2 fixes"
* emailed patches from Andrew Morton <[email protected]>:
hugetlbfs: fix races and page leaks during migration
kasan: turn off asan-stack for clang-8 and earlier
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.kasan | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/Makefile.kasan b/scripts/Makefile.kasan index 25c259df8ffa..6deabedc67fc 100644 --- a/scripts/Makefile.kasan +++ b/scripts/Makefile.kasan @@ -26,7 +26,7 @@ else CFLAGS_KASAN := $(CFLAGS_KASAN_SHADOW) \ $(call cc-param,asan-globals=1) \ $(call cc-param,asan-instrumentation-with-call-threshold=$(call_threshold)) \ - $(call cc-param,asan-stack=1) \ + $(call cc-param,asan-stack=$(CONFIG_KASAN_STACK)) \ $(call cc-param,asan-use-after-scope=1) \ $(call cc-param,asan-instrument-allocas=1) endif |