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

Commit ad0b40fa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm 

Pull ARM fixes from Russell King:
 "Just one fix for a -fstack-protector-strong problem from Kees Cook,
  and adding the new copy_file_range syscall"

* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  ARM: wire up copy_file_range() syscall
  ARM: 8500/1: fix atags_to_fdt with stack-protector-strong
parents ec1cc55d 03590cb5

arch/arm/boot/compressed/Makefile

+9 −0
Original line number Diff line number Diff line
@@ -106,6 +106,15 @@ ORIG_CFLAGS := $(KBUILD_CFLAGS) 
KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))

endif



# -fstack-protector-strong triggers protection checks in this code,

# but it is being used too early to link to meaningful stack_chk logic.

nossp_flags := $(call cc-option, -fno-stack-protector)

CFLAGS_atags_to_fdt.o := $(nossp_flags)

CFLAGS_fdt.o := $(nossp_flags)

CFLAGS_fdt_ro.o := $(nossp_flags)

CFLAGS_fdt_rw.o := $(nossp_flags)

CFLAGS_fdt_wip.o := $(nossp_flags)



ccflags-y := -fpic -mno-single-pic-base -fno-builtin -I$(obj)

asflags-y := -DZIMAGE

arch/arm/include/uapi/asm/unistd.h

+1 −0
Original line number Diff line number Diff line
@@ -417,6 +417,7 @@ 
#define __NR_userfaultfd		(__NR_SYSCALL_BASE+388)

#define __NR_membarrier			(__NR_SYSCALL_BASE+389)

#define __NR_mlock2			(__NR_SYSCALL_BASE+390)

#define __NR_copy_file_range		(__NR_SYSCALL_BASE+391)



/*

 * The following SWIs are ARM private.

arch/arm/kernel/calls.S

+1 −0
Original line number Diff line number Diff line
@@ -400,6 +400,7 @@ 
		CALL(sys_userfaultfd)

		CALL(sys_membarrier)

		CALL(sys_mlock2)

		CALL(sys_copy_file_range)

#ifndef syscalls_counted

.equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls

#define syscalls_counted