Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
Pull ARM fixes from Russell King:
"Just a few relatively small ARM fixes found since the last merge
window, nothing too exciting"
* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
ARM: 7837/3: fix Thumb-2 bug in AES assembler code
ARM: only allow kernel mode neon with AEABI
ARM: 7839/1: entry: fix tracing of ARM-private syscalls
ARM: 7836/1: add __get_user_unaligned/__put_user_unaligned
+13
-7
+1
-2
arch/arm/Kconfig
+1
-2
arch/arm/Kconfig
+3
-3
arch/arm/crypto/aes-armv4.S
+3
-3
arch/arm/crypto/aes-armv4.S
···
148
148
@ const AES_KEY *key) {
149
149
.align 5
150
150
ENTRY(AES_encrypt)
151
-
sub r3,pc,#8 @ AES_encrypt
151
+
adr r3,AES_encrypt
152
152
stmdb sp!,{r1,r4-r12,lr}
153
153
mov r12,r0 @ inp
154
154
mov r11,r2
···
381
381
.align 5
382
382
ENTRY(private_AES_set_encrypt_key)
383
383
_armv4_AES_set_encrypt_key:
384
-
sub r3,pc,#8 @ AES_set_encrypt_key
384
+
adr r3,_armv4_AES_set_encrypt_key
385
385
teq r0,#0
386
386
moveq r0,#-1
387
387
beq .Labrt
···
843
843
@ const AES_KEY *key) {
844
844
.align 5
845
845
ENTRY(AES_decrypt)
846
-
sub r3,pc,#8 @ AES_decrypt
846
+
adr r3,AES_decrypt
847
847
stmdb sp!,{r1,r4-r12,lr}
848
848
mov r12,r0 @ inp
849
849
mov r11,r2
+7
arch/arm/include/asm/uaccess.h
+7
arch/arm/include/asm/uaccess.h
···
19
19
#include <asm/unified.h>
20
20
#include <asm/compiler.h>
21
21
22
+
#if __LINUX_ARM_ARCH__ < 6
23
+
#include <asm-generic/uaccess-unaligned.h>
24
+
#else
25
+
#define __get_user_unaligned __get_user
26
+
#define __put_user_unaligned __put_user
27
+
#endif
28
+
22
29
#define VERIFY_READ 0
23
30
#define VERIFY_WRITE 1
24
31
+2
-2
arch/arm/kernel/entry-common.S
+2
-2
arch/arm/kernel/entry-common.S
···
442
442
ldrcc pc, [tbl, scno, lsl #2] @ call sys_* routine
443
443
444
444
add r1, sp, #S_OFF
445
-
cmp scno, #(__ARM_NR_BASE - __NR_SYSCALL_BASE)
445
+
2: cmp scno, #(__ARM_NR_BASE - __NR_SYSCALL_BASE)
446
446
eor r0, scno, #__NR_SYSCALL_BASE @ put OS number back
447
447
bcs arm_syscall
448
-
2: mov why, #0 @ no longer a real syscall
448
+
mov why, #0 @ no longer a real syscall
449
449
b sys_ni_syscall @ not private func
450
450
451
451
#if defined(CONFIG_OABI_COMPAT) || !defined(CONFIG_AEABI)