From nobody Sun Feb 8 18:40:58 2026 Received: from minute.unseen.parts (minute.unseen.parts [139.162.151.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CDC532080CD; Tue, 4 Feb 2025 22:35:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=139.162.151.61 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738708548; cv=none; b=hkJK0BLdvpe78TMWSOXjoSgchjdmDNn4OjJ9nLuLILB0NzzuOq4WREIYvGWZkv5oBSNWwKpq939qtQ5C0yK+EI0TzTnB9LU7/sKLAeg4vRkkxCNdOek0kXWQULCCid8u0Pb5TTlmFa6TRVfh5S/0it8b+OEDV69IrwOE7l1q8k0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738708548; c=relaxed/simple; bh=CQ4qzfWsPMaEEGfGXT1JB4gjxvLkrvrp2t4Hv8GNe4Q=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JUK8m2LTEtSMTYhsgmgQMOxBMtWfkush5AOS3/jMzew3JIYoABHRPXXS6KORDRd+74jqCLx+U+Qgzrugebe+IHW4Im9sopG0ssiTQKsk/srS5MxnqRXG24ljc3Bukr26F2XGeR0d36Pg1na7ViSAjUbWGw/fBjXlESos7GP5g30= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=unseen.parts; spf=pass smtp.mailfrom=unseen.parts; dkim=pass (2048-bit key) header.d=unseen.parts header.i=@unseen.parts header.b=EVMfy9VF; arc=none smtp.client-ip=139.162.151.61 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=unseen.parts Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=unseen.parts Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=unseen.parts header.i=@unseen.parts header.b="EVMfy9VF" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=unseen.parts; s=sig; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=vc975O5bKoOjSLhU3jjysrQsyU95kH6Hm7RGxzT4vCo=; b=EVMfy9VFUrvrstEn65nm4xnK34 zjpKG4OwTaEQhu6Iy9WWSjrYeK8FW2CVu/CqyviiDBMXcSBhPCoqWlPJX61h4GaO/6Pv6knE5Hag/ /1fcPzVDm9ZwDau7/OOV97y1cg6kgmHbw5s1xs0rwrOeL5gQgikQj3JrRU1QxS/HC22nfnaK5Yx1L rP7C9/GbFvCw2y9AGPwm8PySZG92V5bonqxAYLw37zgicubWMK9FSmWyJur454RjsTWatSMNdx1HA V3IC7Fm3a7kPc5ewE43MLiCakj4YS2zuxMak31JHv1sEMZvjgtgiiHGlaXUU6oI1f4zULXk0RxKap 3xwHvcZg==; Received: from ink by minute.unseen.parts with local (Exim 4.96) (envelope-from ) id 1tfRVs-0001cJ-1U; Tue, 04 Feb 2025 23:35:24 +0100 From: Ivan Kokshaysky To: Richard Henderson , Matt Turner , Oleg Nesterov , Al Viro , Arnd Bergmann , "Paul E. McKenney" Cc: "Maciej W. Rozycki" , Magnus Lindholm , linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH v3 1/3] alpha: replace hardcoded stack offsets with autogenerated ones Date: Tue, 4 Feb 2025 23:35:22 +0100 Message-Id: <20250204223524.6207-2-ink@unseen.parts> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250204223524.6207-1-ink@unseen.parts> References: <20250204223524.6207-1-ink@unseen.parts> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This allows the assembly in entry.S to automatically keep in sync with changes in the stack layout (struct pt_regs and struct switch_stack). Cc: stable@vger.kernel.org Reviewed-by: Maciej W. Rozycki Signed-off-by: Ivan Kokshaysky Tested-by: Maciej W. Rozycki --- arch/alpha/kernel/asm-offsets.c | 4 ++++ arch/alpha/kernel/entry.S | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/alpha/kernel/asm-offsets.c b/arch/alpha/kernel/asm-offset= s.c index 4cfeae42c79a..e9dad60b147f 100644 --- a/arch/alpha/kernel/asm-offsets.c +++ b/arch/alpha/kernel/asm-offsets.c @@ -19,9 +19,13 @@ static void __used foo(void) DEFINE(TI_STATUS, offsetof(struct thread_info, status)); BLANK(); =20 + DEFINE(SP_OFF, offsetof(struct pt_regs, ps)); DEFINE(SIZEOF_PT_REGS, sizeof(struct pt_regs)); BLANK(); =20 + DEFINE(SWITCH_STACK_SIZE, sizeof(struct switch_stack)); + BLANK(); + DEFINE(HAE_CACHE, offsetof(struct alpha_machine_vector, hae_cache)); DEFINE(HAE_REG, offsetof(struct alpha_machine_vector, hae_register)); } diff --git a/arch/alpha/kernel/entry.S b/arch/alpha/kernel/entry.S index dd26062d75b3..6fb38365539d 100644 --- a/arch/alpha/kernel/entry.S +++ b/arch/alpha/kernel/entry.S @@ -15,10 +15,6 @@ .set noat .cfi_sections .debug_frame =20 -/* Stack offsets. */ -#define SP_OFF 184 -#define SWITCH_STACK_SIZE 64 - .macro CFI_START_OSF_FRAME func .align 4 .globl \func --=20 2.47.2 From nobody Sun Feb 8 18:40:58 2026 Received: from minute.unseen.parts (minute.unseen.parts [139.162.151.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A50B4219A8E; Tue, 4 Feb 2025 22:35:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=139.162.151.61 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738708549; cv=none; b=dqJj9JndXYMlQR+brNNUr/6DOEuodYLy+1A646a6suhEPCUImynRDiuK3hdopEl0CbaF0DOOFRqMyd0P3ak695IKnftLWkmH+wGkI9oiT/p7Vfka+VCQVxcB3enm7IL9L9PCiFaW9JltPpwfxaVQub2cZdmlMWYkcgxb7TyqN7k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738708549; c=relaxed/simple; bh=3n8nMv5elRq84ySLHI9crqBdDM0DArlZUQPhIjOh60I=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=AdApccILh6G5Fmr8kZ1x+oTVyJEml4gmzv1gP/LwuS/LjBsySZDtxxHlCSCEf2UNcARjB7b5ruD3v3dKdYEoZbWJ6Bkydu45ldmrCskUB6kTQ3pbt3AjT+vmgV/vpRf85YkMX4QOEyCzYoBPM0HtxR/DaJ8jndnE8W305oqpwBE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=unseen.parts; spf=pass smtp.mailfrom=unseen.parts; dkim=pass (2048-bit key) header.d=unseen.parts header.i=@unseen.parts header.b=IE7TfzeI; arc=none smtp.client-ip=139.162.151.61 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=unseen.parts Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=unseen.parts Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=unseen.parts header.i=@unseen.parts header.b="IE7TfzeI" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=unseen.parts; s=sig; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=hzkENabP7blyPPtr+aCJDt1hMksV24wuwIhX0BcT+Ac=; b=IE7TfzeIq+lGp5rc/dO93m8C+/ ROcXdyygaU0JUV6gFi/51QFnTj0A1BuBPScNa7H8XVRS7SqN1YBks93Nu+NhO0A9CTyRL8r0XgYhj vXGE9MUUpKx8nsF1UM8Mj2Qa80LSqmUy/4CSLUbEUmhhuNBUJeTwLjb887qjickaDULzCaMkwNO3U zDsxrpj6Wje8gbqtJbq8Yp4NCoK5uu1vH0HoPMtkTpij2yzct1dTV5v0cOjX04rBuz7ENJp8MmwVP Gz7x0hmTicOL70MZln5tz539ifzY7eOEjPcKzxiG6ZXw0SFFoeQsQGR21wb4IpGnKo/4vKHYH2vF/ F0k8CnHg==; Received: from ink by minute.unseen.parts with local (Exim 4.96) (envelope-from ) id 1tfRVs-0001cO-1g; Tue, 04 Feb 2025 23:35:24 +0100 From: Ivan Kokshaysky To: Richard Henderson , Matt Turner , Oleg Nesterov , Al Viro , Arnd Bergmann , "Paul E. McKenney" Cc: "Maciej W. Rozycki" , Magnus Lindholm , linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH v3 2/3] alpha: make stack 16-byte aligned (most cases) Date: Tue, 4 Feb 2025 23:35:23 +0100 Message-Id: <20250204223524.6207-3-ink@unseen.parts> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250204223524.6207-1-ink@unseen.parts> References: <20250204223524.6207-1-ink@unseen.parts> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The problem is that GCC expects 16-byte alignment of the incoming stack since early 2004, as Maciej found out [1]: Having actually dug speculatively I can see that the psABI was changed in GCC 3.5 with commit e5e10fb4a350 ("re PR target/14539 (128-bit long double improperly aligned)") back in Mar 2004, when the stack pointer alignment was increased from 8 bytes to 16 bytes, and arch/alpha/kernel/entry.S has various suspicious stack pointer adjustments, starting with SP_OFF which is not a whole multiple of 16. Also, as Magnus noted, "ALPHA Calling Standard" [2] required the same: D.3.1 Stack Alignment This standard requires that stacks be octaword aligned at the time a new procedure is invoked. However: - the "normal" kernel stack is always misaligned by 8 bytes, thanks to the odd number of 64-bit words in 'struct pt_regs', which is the very first thing pushed onto the kernel thread stack; - syscall, fault, interrupt etc. handlers may, or may not, receive aligned stack depending on numerous factors. Somehow we got away with it until recently, when we ended up with a stack corruption in kernel/smp.c:smp_call_function_single() due to its use of 32-byte aligned local data and the compiler doing clever things allocating it on the stack. This adds padding between the PAL-saved and kernel-saved registers so that 'struct pt_regs' have an even number of 64-bit words. This makes the stack properly aligned for most of the kernel code, except two handlers which need special threatment. Note: struct pt_regs doesn't belong in uapi/asm; this should be fixed, but let's put this off until later. Link: https://lore.kernel.org/rcu/alpine.DEB.2.21.2501130248010.18889@angie= .orcam.me.uk/ [1] Link: https://bitsavers.org/pdf/dec/alpha/Alpha_Calling_Standard_Rev_2.0_19= 900427.pdf [2] Cc: stable@vger.kernel.org Reviewed-by: Maciej W. Rozycki Tested-by: Magnus Lindholm Signed-off-by: Ivan Kokshaysky Tested-by: Maciej W. Rozycki --- arch/alpha/include/uapi/asm/ptrace.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/alpha/include/uapi/asm/ptrace.h b/arch/alpha/include/uapi= /asm/ptrace.h index 5ca45934fcbb..72ed913a910f 100644 --- a/arch/alpha/include/uapi/asm/ptrace.h +++ b/arch/alpha/include/uapi/asm/ptrace.h @@ -42,6 +42,8 @@ struct pt_regs { unsigned long trap_a0; unsigned long trap_a1; unsigned long trap_a2; +/* This makes the stack 16-byte aligned as GCC expects */ + unsigned long __pad0; /* These are saved by PAL-code: */ unsigned long ps; unsigned long pc; --=20 2.47.2 From nobody Sun Feb 8 18:40:58 2026 Received: from minute.unseen.parts (minute.unseen.parts [139.162.151.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CDBE914AD2B; Tue, 4 Feb 2025 22:35:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=139.162.151.61 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738708547; cv=none; b=sN2ox9ifI1BHAXWhig/6p9+1vUXFWdVDkr3bPCWgIfBcfmCr/EFUI8msTtcQk/mOF9f/GSq6ouoY4QZph3y6XBjXp6Lic8myaTrGW+sTSGijn+dVcf1+1/J3cqhk/wkF5OHSFeUv2N7PsUq4G08Q3dja6s5BhFPk+BMBBER1Kcc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738708547; c=relaxed/simple; bh=Tbu+XRno/u/g1c/g++qeRZlFVrqJuvN/hVBnJ0xt64k=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=aL2VuNYi4MNjLBO7QZOy+rXc+fQ8lhaBobAN7rdiMNxLLenmYsSvJMYP6wIIybyiQhD5VRjjHN0K2mJg9CYgvy6cZuS0eSQCZVgG8Wq5RkgfXXF//3uimX+fN8y6IUUBN3N9ibQWXL/1EpmRIcrFx9sF7M/Xl9eFNq1cVnNnDWk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=unseen.parts; spf=pass smtp.mailfrom=unseen.parts; dkim=pass (2048-bit key) header.d=unseen.parts header.i=@unseen.parts header.b=GuLlVvIp; arc=none smtp.client-ip=139.162.151.61 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=unseen.parts Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=unseen.parts Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=unseen.parts header.i=@unseen.parts header.b="GuLlVvIp" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=unseen.parts; s=sig; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=eu0uinCL9OMvaWq1Gs/7fRYGHoqa6F3Rj2exh5B37II=; b=GuLlVvIpQdKIiSi/2g1IZRavf+ XkzWIQOFkDhIaFBcpUw8amudSkCgyOXW29+LYHSpVvswk/aKwbzNT7HFfDJ9c4kLCUTDtqQec7Pbz ursqosVy9YBrj+OF7lM4JZ2QgdZTfmj8ZSWap8HsCMNvfylNczh/vV7sG6bGKqU+lBGePfPX1NGpJ wzuqpbKQ48RGGnfrye7LBGvEVStssDtHPOSkOs1vnZ09qYs93n73ZybmR3PPM2qpeK01e/ZiQB8CF cglSS6qr0QYdx4teAIu0ReZTwViSpyT4I5R0SkcOq3ME2+n1yqmHWa7EYME/pJyh4tNGtCbjr4BN3 ZUPNwhTg==; Received: from ink by minute.unseen.parts with local (Exim 4.96) (envelope-from ) id 1tfRVs-0001cT-1p; Tue, 04 Feb 2025 23:35:24 +0100 From: Ivan Kokshaysky To: Richard Henderson , Matt Turner , Oleg Nesterov , Al Viro , Arnd Bergmann , "Paul E. McKenney" Cc: "Maciej W. Rozycki" , Magnus Lindholm , linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH v3 3/3] alpha: align stack for page fault and user unaligned trap handlers Date: Tue, 4 Feb 2025 23:35:24 +0100 Message-Id: <20250204223524.6207-4-ink@unseen.parts> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250204223524.6207-1-ink@unseen.parts> References: <20250204223524.6207-1-ink@unseen.parts> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" do_page_fault() and do_entUna() are special because they use non-standard stack frame layout. Fix them manually. Cc: stable@vger.kernel.org Reviewed-by: Maciej W. Rozycki Tested-by: Magnus Lindholm Suggested-by: Maciej W. Rozycki Signed-off-by: Ivan Kokshaysky Tested-by: Maciej W. Rozycki --- arch/alpha/kernel/entry.S | 20 ++++++++++---------- arch/alpha/kernel/traps.c | 2 +- arch/alpha/mm/fault.c | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/alpha/kernel/entry.S b/arch/alpha/kernel/entry.S index 6fb38365539d..f4d41b4538c2 100644 --- a/arch/alpha/kernel/entry.S +++ b/arch/alpha/kernel/entry.S @@ -194,8 +194,8 @@ CFI_END_OSF_FRAME entArith CFI_START_OSF_FRAME entMM SAVE_ALL /* save $9 - $15 so the inline exception code can manipulate them. */ - subq $sp, 56, $sp - .cfi_adjust_cfa_offset 56 + subq $sp, 64, $sp + .cfi_adjust_cfa_offset 64 stq $9, 0($sp) stq $10, 8($sp) stq $11, 16($sp) @@ -210,7 +210,7 @@ CFI_START_OSF_FRAME entMM .cfi_rel_offset $13, 32 .cfi_rel_offset $14, 40 .cfi_rel_offset $15, 48 - addq $sp, 56, $19 + addq $sp, 64, $19 /* handle the fault */ lda $8, 0x3fff bic $sp, $8, $8 @@ -223,7 +223,7 @@ CFI_START_OSF_FRAME entMM ldq $13, 32($sp) ldq $14, 40($sp) ldq $15, 48($sp) - addq $sp, 56, $sp + addq $sp, 64, $sp .cfi_restore $9 .cfi_restore $10 .cfi_restore $11 @@ -231,7 +231,7 @@ CFI_START_OSF_FRAME entMM .cfi_restore $13 .cfi_restore $14 .cfi_restore $15 - .cfi_adjust_cfa_offset -56 + .cfi_adjust_cfa_offset -64 /* finish up the syscall as normal. */ br ret_from_sys_call CFI_END_OSF_FRAME entMM @@ -378,8 +378,8 @@ entUnaUser: .cfi_restore $0 .cfi_adjust_cfa_offset -256 SAVE_ALL /* setup normal kernel stack */ - lda $sp, -56($sp) - .cfi_adjust_cfa_offset 56 + lda $sp, -64($sp) + .cfi_adjust_cfa_offset 64 stq $9, 0($sp) stq $10, 8($sp) stq $11, 16($sp) @@ -395,7 +395,7 @@ entUnaUser: .cfi_rel_offset $14, 40 .cfi_rel_offset $15, 48 lda $8, 0x3fff - addq $sp, 56, $19 + addq $sp, 64, $19 bic $sp, $8, $8 jsr $26, do_entUnaUser ldq $9, 0($sp) @@ -405,7 +405,7 @@ entUnaUser: ldq $13, 32($sp) ldq $14, 40($sp) ldq $15, 48($sp) - lda $sp, 56($sp) + lda $sp, 64($sp) .cfi_restore $9 .cfi_restore $10 .cfi_restore $11 @@ -413,7 +413,7 @@ entUnaUser: .cfi_restore $13 .cfi_restore $14 .cfi_restore $15 - .cfi_adjust_cfa_offset -56 + .cfi_adjust_cfa_offset -64 br ret_from_sys_call CFI_END_OSF_FRAME entUna =20 diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c index a9a38c80c4a7..7004397937cf 100644 --- a/arch/alpha/kernel/traps.c +++ b/arch/alpha/kernel/traps.c @@ -649,7 +649,7 @@ s_reg_to_mem (unsigned long s_reg) static int unauser_reg_offsets[32] =3D { R(r0), R(r1), R(r2), R(r3), R(r4), R(r5), R(r6), R(r7), R(r8), /* r9 ... r15 are stored in front of regs. */ - -56, -48, -40, -32, -24, -16, -8, + -64, -56, -48, -40, -32, -24, -16, /* padding at -8 */ R(r16), R(r17), R(r18), R(r19), R(r20), R(r21), R(r22), R(r23), R(r24), R(r25), R(r26), R(r27), R(r28), R(gp), diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c index 8c9850437e67..a9816bbc9f34 100644 --- a/arch/alpha/mm/fault.c +++ b/arch/alpha/mm/fault.c @@ -78,8 +78,8 @@ __load_new_mm_context(struct mm_struct *next_mm) =20 /* Macro for exception fixup code to access integer registers. */ #define dpf_reg(r) \ - (((unsigned long *)regs)[(r) <=3D 8 ? (r) : (r) <=3D 15 ? (r)-16 : \ - (r) <=3D 18 ? (r)+10 : (r)-10]) + (((unsigned long *)regs)[(r) <=3D 8 ? (r) : (r) <=3D 15 ? (r)-17 : \ + (r) <=3D 18 ? (r)+11 : (r)-10]) =20 asmlinkage void do_page_fault(unsigned long address, unsigned long mmcsr, --=20 2.47.2