diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 17:45:38 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-08 17:46:06 +0000 |
| commit | 30c4ae2eedacfbb99ce91d04f6232e7c26e498dd (patch) | |
| tree | 968a4e3149e28312eb427de8cdfc970ad5a8cffb /debian/patches-rt/0278-powerpc-stackprotector-work-around-stack-guard-init-.patch | |
| parent | Merging upstream version 5.10.216. (diff) | |
| download | linux-30c4ae2eedacfbb99ce91d04f6232e7c26e498dd.tar.xz linux-30c4ae2eedacfbb99ce91d04f6232e7c26e498dd.zip | |
Merging debian version 5.10.216-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches-rt/0278-powerpc-stackprotector-work-around-stack-guard-init-.patch')
| -rw-r--r-- | debian/patches-rt/0278-powerpc-stackprotector-work-around-stack-guard-init-.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches-rt/0278-powerpc-stackprotector-work-around-stack-guard-init-.patch b/debian/patches-rt/0278-powerpc-stackprotector-work-around-stack-guard-init-.patch index a46f2fadf..fdd40cc96 100644 --- a/debian/patches-rt/0278-powerpc-stackprotector-work-around-stack-guard-init-.patch +++ b/debian/patches-rt/0278-powerpc-stackprotector-work-around-stack-guard-init-.patch @@ -1,9 +1,9 @@ -From fdb2b0b4898a26e8910152ed1ab6fa6748d1b839 Mon Sep 17 00:00:00 2001 +From 8a5fd92365934ca6cf2c26a16c1eb3a859048ff4 Mon Sep 17 00:00:00 2001 From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Date: Tue, 26 Mar 2019 18:31:29 +0100 Subject: [PATCH 278/323] powerpc/stackprotector: work around stack-guard init from atomic -Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.204-rt100.tar.xz +Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.215-rt107.tar.xz This is invoked from the secondary CPU in atomic context. On x86 we use tsc instead. On Power we XOR it against mftb() so lets use stack address @@ -16,7 +16,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> 1 file changed, 4 insertions(+) diff --git a/arch/powerpc/include/asm/stackprotector.h b/arch/powerpc/include/asm/stackprotector.h -index 1c8460e23583..b1653c160bab 100644 +index 1c8460e235838..b1653c160bab9 100644 --- a/arch/powerpc/include/asm/stackprotector.h +++ b/arch/powerpc/include/asm/stackprotector.h @@ -24,7 +24,11 @@ static __always_inline void boot_init_stack_canary(void) @@ -32,5 +32,5 @@ index 1c8460e23583..b1653c160bab 100644 canary ^= LINUX_VERSION_CODE; canary &= CANARY_MASK; -- -2.43.0 +2.44.0 |