summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-03-17 12:14:49 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-03-17 12:14:49 -0700
commitc79d5ff0e249824674e70e89142f55b52f261722 (patch)
treecaca22efd9607f4c26018505fb9237832d1ba8a7 /arch
parentf89406ca1f454506f4177cfaa51de44e3247cd0d (diff)
parenta1016e94cce9fb6ea56d7602263783e2d95d6e92 (diff)
downloadlinux-stable-c79d5ff0e249824674e70e89142f55b52f261722.tar.gz
linux-stable-c79d5ff0e249824674e70e89142f55b52f261722.tar.bz2
linux-stable-c79d5ff0e249824674e70e89142f55b52f261722.zip
Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm
Pull ARM fix from Russell King: "Just one change to add the statx syscall this time around" * 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm: ARM: wire up statx syscall
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/tools/syscall.tbl1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/tools/syscall.tbl b/arch/arm/tools/syscall.tbl
index 3c2cb5d5adfa..0bb0e9c6376c 100644
--- a/arch/arm/tools/syscall.tbl
+++ b/arch/arm/tools/syscall.tbl
@@ -411,3 +411,4 @@
394 common pkey_mprotect sys_pkey_mprotect
395 common pkey_alloc sys_pkey_alloc
396 common pkey_free sys_pkey_free
+397 common statx sys_statx