Commit 69984b64 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux 

Pull arm64 fixes from Will Deacon:
 "Here are a few more arm64 fixes for 4.3.  Again, nothing too
  significant, but worth having nonetheless.  The MINSIGSTKSZ update is
  a bit grotty, but the value we currently have is wrong (too small), so
  anybody using that will have issues already.  It has Arnd's ack for
  the asm-generic change.

  Summary:

   - Fix module CFLAGS setting in workaround for erratum #843419
   - Update MINSIGSTKSZ and SIGSTKSZ to match glibc
   - Wire up some new compat syscalls"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: compat: wire up new syscalls
  arm64: Fix MINSIGSTKSZ and SIGSTKSZ
  arm64: errata: use KBUILD_CFLAGS_MODULE for erratum #843419
parents 31558237 eb93ce2c

arch/arm64/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ endif 
CHECKFLAGS	+= -D__aarch64__



ifeq ($(CONFIG_ARM64_ERRATUM_843419), y)

CFLAGS_MODULE	+= -mcmodel=large

KBUILD_CFLAGS_MODULE	+= -mcmodel=large

endif



# Default value

arch/arm64/include/asm/unistd.h

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
#define __ARM_NR_compat_cacheflush	(__ARM_NR_COMPAT_BASE+2)

#define __ARM_NR_compat_set_tls		(__ARM_NR_COMPAT_BASE+5)



#define __NR_compat_syscalls		388

#define __NR_compat_syscalls		390

#endif



#define __ARCH_WANT_SYS_CLONE

arch/arm64/include/asm/unistd32.h

+9 −0
Original line number Diff line number Diff line
@@ -797,3 +797,12 @@ __SYSCALL(__NR_memfd_create, sys_memfd_create) 
__SYSCALL(__NR_bpf, sys_bpf)

#define __NR_execveat 387

__SYSCALL(__NR_execveat, compat_sys_execveat)

#define __NR_userfaultfd 388

__SYSCALL(__NR_userfaultfd, sys_userfaultfd)

#define __NR_membarrier 389

__SYSCALL(__NR_membarrier, sys_membarrier)



/*

 * Please add new compat syscalls above this comment and update

 * __NR_compat_syscalls in asm/unistd.h.

 */

arch/arm64/include/uapi/asm/signal.h

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ 
/* Required for AArch32 compatibility. */

#define SA_RESTORER	0x04000000



#define MINSIGSTKSZ 5120

#define SIGSTKSZ    16384



#include <asm-generic/signal.h>



#endif

include/uapi/asm-generic/signal.h

+2 −0
Original line number Diff line number Diff line
@@ -80,8 +80,10 @@ 
 *	SA_RESTORER	0x04000000

 */



#if !defined MINSIGSTKSZ || !defined SIGSTKSZ

#define MINSIGSTKSZ	2048

#define SIGSTKSZ	8192

#endif



#ifndef __ASSEMBLY__

typedef struct {

CRA Git | Maintained and supported by SUSTech CRA and CCSE