diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-08-30 10:27:13 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-08-30 10:27:13 +0800 |
commit | b56111f481e16510558a892d5d56cb90cadd96c0 (patch) | |
tree | bfca590ae8c2e8be7a7c44faba15ae3fd548f925 /arch/Kconfig | |
parent | b8060c794f53e364a967ce483cef8e86f4006a61 (diff) | |
parent | 59e65b4bbfe7d0139ab1ab59cd27a5db95f5bb7b (diff) |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/Kconfig')
-rw-r--r-- | arch/Kconfig | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index 31a318a56d98..98f64ad1caf1 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -423,6 +423,15 @@ config CC_STACKPROTECTOR_STRONG endchoice +config HAVE_ARCH_WITHIN_STACK_FRAMES + bool + help + An architecture should select this if it can walk the kernel stack + frames to determine if an object is part of either the arguments + or local variables (i.e. that it excludes saved return addresses, + and similar) by implementing an inline arch_within_stack_frames(), + which is used by CONFIG_HARDENED_USERCOPY. + config HAVE_CONTEXT_TRACKING bool help |