tjh.dev / kernel
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 branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm

Pull ARM fix from Russell King:
"Just one fix for a problem in the csum_partial_copy_from_user()
implementation when software PAN is enabled"

* 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
ARM: 8731/1: Fix csum_partial_copy_from_user() stack mismatch

Linus Torvalds 877631f3 1362d628

+4
+4
arch/arm/lib/csumpartialcopyuser.S
··· 85 85 .pushsection .text.fixup,"ax" 86 86 .align 4 87 87 9001: mov r4, #-EFAULT 88 + #ifdef CONFIG_CPU_SW_DOMAIN_PAN 89 + ldr r5, [sp, #9*4] @ *err_ptr 90 + #else 88 91 ldr r5, [sp, #8*4] @ *err_ptr 92 + #endif 89 93 str r4, [r5] 90 94 ldmia sp, {r1, r2} @ retrieve dst, len 91 95 add r2, r2, r1