diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-11-06 21:49:33 +0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-11-06 21:49:33 +0300 |
| commit | 7f9f879243d6cf5d2d60d12065e93189cc343387 (patch) | |
| tree | e74619a16f8291f7225ee9877cf93e530243e0d3 /arch/arm/include/asm/stackprotector.h | |
| parent | 32f7aa2731b24ad8393f26d63df959d74844345f (diff) | |
| parent | fe91c4725aeed35023ba4f7a1e1adfebb6878c23 (diff) | |
| download | linux-7f9f879243d6cf5d2d60d12065e93189cc343387.tar.xz | |
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up some tools/perf/ patches that went via tip/perf/core, such
as:
tools/perf: Add mem_hops field in perf_mem_data_src structure
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'arch/arm/include/asm/stackprotector.h')
| -rw-r--r-- | arch/arm/include/asm/stackprotector.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/include/asm/stackprotector.h b/arch/arm/include/asm/stackprotector.h index 72a20c3a0a90..088d03161be5 100644 --- a/arch/arm/include/asm/stackprotector.h +++ b/arch/arm/include/asm/stackprotector.h @@ -39,8 +39,6 @@ static __always_inline void boot_init_stack_canary(void) current->stack_canary = canary; #ifndef CONFIG_STACKPROTECTOR_PER_TASK __stack_chk_guard = current->stack_canary; -#else - current_thread_info()->stack_canary = current->stack_canary; #endif } |