Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 874db4d8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 6cac446b 40190c85

arch/arm/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -2217,8 +2217,7 @@ config NEON 


config KERNEL_MODE_NEON

	bool "Support for NEON in kernel mode"

	default n

	depends on NEON

	depends on NEON && AEABI

	help

	  Say Y to include support for NEON in kernel mode.

arch/arm/crypto/aes-armv4.S

+3 −3
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ AES_Te: 
@ 		 const AES_KEY *key) {

.align	5

ENTRY(AES_encrypt)

	sub	r3,pc,#8		@ AES_encrypt

	adr	r3,AES_encrypt

	stmdb   sp!,{r1,r4-r12,lr}

	mov	r12,r0		@ inp

	mov	r11,r2
@@ -381,7 +381,7 @@ _armv4_AES_encrypt: 
.align	5

ENTRY(private_AES_set_encrypt_key)

_armv4_AES_set_encrypt_key:

	sub	r3,pc,#8		@ AES_set_encrypt_key

	adr	r3,_armv4_AES_set_encrypt_key

	teq	r0,#0

	moveq	r0,#-1

	beq	.Labrt
@@ -843,7 +843,7 @@ AES_Td: 
@ 		 const AES_KEY *key) {

.align	5

ENTRY(AES_decrypt)

	sub	r3,pc,#8		@ AES_decrypt

	adr	r3,AES_decrypt

	stmdb   sp!,{r1,r4-r12,lr}

	mov	r12,r0		@ inp

	mov	r11,r2

arch/arm/include/asm/uaccess.h

+7 −0
Original line number Diff line number Diff line
@@ -19,6 +19,13 @@ 
#include <asm/unified.h>

#include <asm/compiler.h>



#if __LINUX_ARM_ARCH__ < 6

#include <asm-generic/uaccess-unaligned.h>

#else

#define __get_user_unaligned __get_user

#define __put_user_unaligned __put_user

#endif



#define VERIFY_READ 0

#define VERIFY_WRITE 1

arch/arm/kernel/entry-common.S

+2 −2
Original line number Diff line number Diff line
@@ -442,10 +442,10 @@ local_restart: 
	ldrcc	pc, [tbl, scno, lsl #2]		@ call sys_* routine



	add	r1, sp, #S_OFF

	cmp	scno, #(__ARM_NR_BASE - __NR_SYSCALL_BASE)

2:	cmp	scno, #(__ARM_NR_BASE - __NR_SYSCALL_BASE)

	eor	r0, scno, #__NR_SYSCALL_BASE	@ put OS number back

	bcs	arm_syscall

2:	mov	why, #0				@ no longer a real syscall

	mov	why, #0				@ no longer a real syscall

	b	sys_ni_syscall			@ not private func



#if defined(CONFIG_OABI_COMPAT) || !defined(CONFIG_AEABI)