diff options
| author | Mark Brown <broonie@kernel.org> | 2015-01-16 22:50:34 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-17 01:23:42 +0000 |
| commit | d1f7a4c0bfda09bebb1948e2169a6ce6a7319bd3 (patch) | |
| tree | 872faf5dcd234e04025a526e83e867a7855cb9b7 /arch/arm64/kernel/process.c | |
| parent | c293f79246d7cdaf6e75b40aa1f957eb8d195835 (diff) | |
| parent | c0131386abdafa081356c1c02129df6413e685e0 (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk
Conflicts:
arch/arm/include/asm/psci.h
arch/arm/kernel/psci.c
arch/arm/kernel/psci_smp.c
arch/arm/kernel/setup.c
arch/arm64/Kconfig
arch/arm64/include/asm/cpu_ops.h
arch/arm64/include/asm/pgtable.h
arch/arm64/include/asm/psci.h
arch/arm64/kernel/head.S
arch/arm64/kernel/psci.c
arch/arm64/kernel/ptrace.c
Diffstat (limited to 'arch/arm64/kernel/process.c')
| -rw-r--r-- | arch/arm64/kernel/process.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index 75c6b1e0d606..150134bf8738 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -52,6 +52,12 @@ #include <asm/processor.h> #include <asm/stacktrace.h> +#ifdef CONFIG_CC_STACKPROTECTOR +#include <linux/stackprotector.h> +unsigned long __stack_chk_guard __read_mostly; +EXPORT_SYMBOL(__stack_chk_guard); +#endif + static void setup_restart(void) { /* |