diff options
author | Tony Lindgren <tony@atomide.com> | 2016-01-25 10:46:21 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2016-01-25 10:46:21 -0800 |
commit | 7e3b1207705c10ada363bbc7d0235730ce1f5b79 (patch) | |
tree | cd1eb567acb4e72c1bdfbe8b59746c73b8627ee5 /arch/ia64/kernel/entry.S | |
parent | 143c6fe3a415edf2dde3f507b3a00998b4c4001e (diff) | |
parent | 20437f79f6627a31752f422688a6047c25cefcf1 (diff) |
Merge branch 'enable-devices' into omap-for-v4.5/fixes
Diffstat (limited to 'arch/ia64/kernel/entry.S')
-rw-r--r-- | arch/ia64/kernel/entry.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index 534a74acb849..477c55e244ec 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S @@ -1772,5 +1772,6 @@ sys_call_table: data8 sys_membarrier data8 sys_kcmp // 1345 data8 sys_mlock2 + data8 sys_copy_file_range .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls |