Commit 34074da5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-5.19/parisc-4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux 

Pull parisc architecture fixes from Helge Deller:
 "Two important fixes for bugs in code which was added in 5.18:

   - Fix userspace signal failures on 32-bit kernel due to a bug in vDSO

   - Fix 32-bit load-word unalignment exception handler which returned
     wrong values"

* tag 'for-5.19/parisc-4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Fix vDSO signal breakage on 32-bit kernel
  parisc/unaligned: Fix emulate_ldw() breakage
parents bb7c5126 aa78fa90

arch/parisc/kernel/asm-offsets.c

+5 −0
Original line number Diff line number Diff line
@@ -224,8 +224,13 @@ int main(void) 
	BLANK();

	DEFINE(ASM_SIGFRAME_SIZE, PARISC_RT_SIGFRAME_SIZE);

	DEFINE(SIGFRAME_CONTEXT_REGS, offsetof(struct rt_sigframe, uc.uc_mcontext) - PARISC_RT_SIGFRAME_SIZE);

#ifdef CONFIG_64BIT

	DEFINE(ASM_SIGFRAME_SIZE32, PARISC_RT_SIGFRAME_SIZE32);

	DEFINE(SIGFRAME_CONTEXT_REGS32, offsetof(struct compat_rt_sigframe, uc.uc_mcontext) - PARISC_RT_SIGFRAME_SIZE32);

#else

	DEFINE(ASM_SIGFRAME_SIZE32, PARISC_RT_SIGFRAME_SIZE);

	DEFINE(SIGFRAME_CONTEXT_REGS32, offsetof(struct rt_sigframe, uc.uc_mcontext) - PARISC_RT_SIGFRAME_SIZE);

#endif

	BLANK();

	DEFINE(ICACHE_BASE, offsetof(struct pdc_cache_info, ic_base));

	DEFINE(ICACHE_STRIDE, offsetof(struct pdc_cache_info, ic_stride));

arch/parisc/kernel/unaligned.c

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static int emulate_ldw(struct pt_regs *regs, int toreg, int flop) 
"	depw	%%r0,31,2,%4\n"

"1:	ldw	0(%%sr1,%4),%0\n"

"2:	ldw	4(%%sr1,%4),%3\n"

"	subi	32,%4,%2\n"

"	subi	32,%2,%2\n"

"	mtctl	%2,11\n"

"	vshd	%0,%3,%0\n"

"3:	\n"