diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-02-13 19:50:59 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-02-13 19:50:59 +0800 |
| commit | d132d2582dfae27f095707fca4a0bdcd1eb3977b (patch) | |
| tree | da00f302d96f271e5bf847e2fdf9f5e5a5d7163a /arch/arm64 | |
| parent | a40f2a595adfe0be6ced06fdb4c4a24ae3291a91 (diff) | |
| parent | f0feeec9c246f6518e168daec66d92a4a6bf0965 (diff) | |
Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4
Conflicts:
keep HAVE_ARCH_WITHIN_STACK_FRAMES in arch/x86/Kconfig
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 703b7f921806..f25cba58e4d1 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -57,6 +57,7 @@ config ARM64 select HAVE_ARCH_SECCOMP_FILTER select HAVE_ARCH_TRACEHOOK select HAVE_BPF_JIT + select HAVE_EBPF_JIT select HAVE_C_RECORDMCOUNT select HAVE_CC_STACKPROTECTOR select HAVE_CMPXCHG_DOUBLE |