diff options
author | Grant Likely <grant.likely@linaro.org> | 2014-03-04 09:44:10 +0100 |
---|---|---|
committer | Grant Likely <grant.likely@linaro.org> | 2014-03-04 09:44:10 +0100 |
commit | dab2310d9d90eded48625c5382c6a60389bf8ca9 (patch) | |
tree | 9327cc815d69dec23aebf03407e3fa82b6d2fbaa /arch/mips/kernel/scall64-64.S | |
parent | Revert "of: fix of_update_property()" (diff) | |
parent | Linux 3.14-rc5 (diff) | |
download | linux-dab2310d9d90eded48625c5382c6a60389bf8ca9.tar.xz linux-dab2310d9d90eded48625c5382c6a60389bf8ca9.zip |
Merge tag 'v3.14-rc5' into HEAD
Linux 3.14-rc5
Diffstat (limited to 'arch/mips/kernel/scall64-64.S')
-rw-r--r-- | arch/mips/kernel/scall64-64.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S index 57e3742fec59..b56e254beb15 100644 --- a/arch/mips/kernel/scall64-64.S +++ b/arch/mips/kernel/scall64-64.S @@ -425,4 +425,6 @@ EXPORT(sys_call_table) PTR sys_kcmp PTR sys_finit_module PTR sys_getdents64 + PTR sys_sched_setattr + PTR sys_sched_getattr /* 5310 */ .size sys_call_table,.-sys_call_table |