Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

+6 -1
+5
arch/parisc/kernel/asm-offsets.c
··· 224 224 BLANK(); 225 225 DEFINE(ASM_SIGFRAME_SIZE, PARISC_RT_SIGFRAME_SIZE); 226 226 DEFINE(SIGFRAME_CONTEXT_REGS, offsetof(struct rt_sigframe, uc.uc_mcontext) - PARISC_RT_SIGFRAME_SIZE); 227 + #ifdef CONFIG_64BIT 227 228 DEFINE(ASM_SIGFRAME_SIZE32, PARISC_RT_SIGFRAME_SIZE32); 228 229 DEFINE(SIGFRAME_CONTEXT_REGS32, offsetof(struct compat_rt_sigframe, uc.uc_mcontext) - PARISC_RT_SIGFRAME_SIZE32); 230 + #else 231 + DEFINE(ASM_SIGFRAME_SIZE32, PARISC_RT_SIGFRAME_SIZE); 232 + DEFINE(SIGFRAME_CONTEXT_REGS32, offsetof(struct rt_sigframe, uc.uc_mcontext) - PARISC_RT_SIGFRAME_SIZE); 233 + #endif 229 234 BLANK(); 230 235 DEFINE(ICACHE_BASE, offsetof(struct pdc_cache_info, ic_base)); 231 236 DEFINE(ICACHE_STRIDE, offsetof(struct pdc_cache_info, ic_stride));
+1 -1
arch/parisc/kernel/unaligned.c
··· 146 146 " depw %%r0,31,2,%4\n" 147 147 "1: ldw 0(%%sr1,%4),%0\n" 148 148 "2: ldw 4(%%sr1,%4),%3\n" 149 - " subi 32,%4,%2\n" 149 + " subi 32,%2,%2\n" 150 150 " mtctl %2,11\n" 151 151 " vshd %0,%3,%0\n" 152 152 "3: \n"