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

Commit 04527fda 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 two changes this time around:

   - wire up the new mlock2 syscall added during the last merge window

   - fix a build problem with certain configurations provoked by making
     CONFIG_OF user selectable"

* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  ARM: 8454/1: OF implies OF_FLATTREE
  ARM: wire up mlock2 syscall
parents 36511e86 aa7d5f18

arch/arm/Kconfig

+2 −2
Original line number Original line Diff line number Diff line
@@ -76,6 +76,8 @@ config ARM 
	select IRQ_FORCED_THREADING

	select IRQ_FORCED_THREADING

	select MODULES_USE_ELF_REL

	select MODULES_USE_ELF_REL

	select NO_BOOTMEM

	select NO_BOOTMEM

	select OF_EARLY_FLATTREE if OF

	select OF_RESERVED_MEM if OF

	select OLD_SIGACTION

	select OLD_SIGACTION

	select OLD_SIGSUSPEND3

	select OLD_SIGSUSPEND3

	select PERF_USE_VMALLOC

	select PERF_USE_VMALLOC
@@ -1822,8 +1824,6 @@ config USE_OF 
	bool "Flattened Device Tree support"

	bool "Flattened Device Tree support"

	select IRQ_DOMAIN

	select IRQ_DOMAIN

	select OF

	select OF

	select OF_EARLY_FLATTREE

	select OF_RESERVED_MEM

	help

	help

	  Include support for flattened device tree machine descriptions.

	  Include support for flattened device tree machine descriptions.

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -416,6 +416,7 @@ 
#define __NR_execveat			(__NR_SYSCALL_BASE+387)

#define __NR_execveat			(__NR_SYSCALL_BASE+387)

#define __NR_userfaultfd		(__NR_SYSCALL_BASE+388)

#define __NR_userfaultfd		(__NR_SYSCALL_BASE+388)

#define __NR_membarrier			(__NR_SYSCALL_BASE+389)

#define __NR_membarrier			(__NR_SYSCALL_BASE+389)

#define __NR_mlock2			(__NR_SYSCALL_BASE+390)





/*

/*

 * The following SWIs are ARM private.

 * The following SWIs are ARM private.

arch/arm/kernel/calls.S

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

		CALL(sys_execveat)

		CALL(sys_userfaultfd)

		CALL(sys_userfaultfd)

		CALL(sys_membarrier)

		CALL(sys_membarrier)

		CALL(sys_mlock2)

#ifndef syscalls_counted

#ifndef syscalls_counted

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

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

#define syscalls_counted

#define syscalls_counted