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

Commit 26d189b8 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:
 "This small set of fixes addresses a few issues introduced during the
  merge window, including:

   - fix typo in I-cache detection that was causing us to treat all
     I-caches as aliasing
   - hook up memfd_create and getrandom syscalls for native and compat
   - revert a temporary hack for defconfig builds in -next (the audit
     tree changes didn't make it in this merge window)
   - a couple of UEFI fixes for TEXT_OFFSET fuzzing and /memreserve/
   - a simple sparsemem fix for 48-bit physical addressing
   - small defconfig updates to get autotesters working with X-gene"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  Revert "arm64: Do not invoke audit_syscall_* functions if !CONFIG_AUDIT_SYSCALL"
  arm64: mm: update max pa bits to 48
  arm64: ignore DT memreserve entries when booting in UEFI mode
  arm64: configs: Enable X-Gene SATA and ethernet in defconfig
  arm64: align randomized TEXT_OFFSET on 4 kB boundary
  asm-generic: add memfd_create system call to unistd.h
  arm64: compat: wire up memfd_create and getrandom syscalls for aarch32
  arm64: fix typo in I-cache policy detection
parents 1ae45cf0 44b37507

arch/arm64/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ head-y := arch/arm64/kernel/head.o 


# The byte offset of the kernel image in RAM from the start of RAM.

ifeq ($(CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET), y)

TEXT_OFFSET := $(shell awk 'BEGIN {srand(); printf "0x%04x0\n", int(65535 * rand())}')

TEXT_OFFSET := $(shell awk 'BEGIN {srand(); printf "0x%03x000\n", int(512 * rand())}')

else

TEXT_OFFSET := 0x00080000

endif

arch/arm64/configs/defconfig

+3 −0
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ CONFIG_VIRTIO_BLK=y 
CONFIG_BLK_DEV_SD=y

# CONFIG_SCSI_LOWLEVEL is not set

CONFIG_ATA=y

CONFIG_AHCI_XGENE=y

CONFIG_PHY_XGENE=y

CONFIG_PATA_PLATFORM=y

CONFIG_PATA_OF_PLATFORM=y

CONFIG_NETDEVICES=y
@@ -71,6 +73,7 @@ CONFIG_TUN=y 
CONFIG_VIRTIO_NET=y

CONFIG_SMC91X=y

CONFIG_SMSC911X=y

CONFIG_NET_XGENE=y

# CONFIG_WLAN is not set

CONFIG_INPUT_EVDEV=y

# CONFIG_SERIO_SERPORT is not set

arch/arm64/include/asm/sparsemem.h

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#define __ASM_SPARSEMEM_H



#ifdef CONFIG_SPARSEMEM

#define MAX_PHYSMEM_BITS	40

#define MAX_PHYSMEM_BITS	48

#define SECTION_SIZE_BITS	30

#endif

arch/arm64/include/asm/unistd.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,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		383

#define __NR_compat_syscalls		386

#endif



#define __ARCH_WANT_SYS_CLONE

arch/arm64/include/asm/unistd32.h

+5 −0
Original line number Diff line number Diff line
@@ -787,3 +787,8 @@ __SYSCALL(__NR_sched_setattr, sys_sched_setattr) 
__SYSCALL(__NR_sched_getattr, sys_sched_getattr)

#define __NR_renameat2 382

__SYSCALL(__NR_renameat2, sys_renameat2)

			/* 383 for seccomp */

#define __NR_getrandom 384

__SYSCALL(__NR_getrandom, sys_getrandom)

#define __NR_memfd_create 385

__SYSCALL(__NR_memfd_create, sys_memfd_create)