diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-04-10 23:40:42 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-04-10 23:40:42 +0200 |
| commit | b769fefb68cd70385d68220ae341e5a10723fbc0 (patch) | |
| tree | a2881410c9dc5a3474619d155fac981cfbd4ee8f /arch/mips/kernel/scall64-n32.S | |
| parent | Merge branch 'drm-next-4.12' of git://people.freedesktop.org/~agd5f/linux int... (diff) | |
| parent | Linux 4.11-rc6 (diff) | |
| download | linux-b769fefb68cd70385d68220ae341e5a10723fbc0.tar.xz linux-b769fefb68cd70385d68220ae341e5a10723fbc0.zip | |
Backmerge tag 'v4.11-rc6' into drm-next
Linux 4.11-rc6
drm-misc needs 4.11-rc5, may as well fix conflicts with rc6.
Diffstat (limited to 'arch/mips/kernel/scall64-n32.S')
| -rw-r--r-- | arch/mips/kernel/scall64-n32.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S index 0331ba39a065..90bad2d1b2d3 100644 --- a/arch/mips/kernel/scall64-n32.S +++ b/arch/mips/kernel/scall64-n32.S @@ -433,4 +433,5 @@ EXPORT(sysn32_call_table) PTR sys_pkey_mprotect PTR sys_pkey_alloc PTR sys_pkey_free + PTR sys_statx /* 6330 */ .size sysn32_call_table,.-sysn32_call_table |