diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-03-15 03:17:33 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-03-15 03:17:33 -0400 |
| commit | 12b8aeee3e51654fb95a3baff2e093f2513bb87d (patch) | |
| tree | 73f78d62591b197cd53747e36a2f3d707b79a50b /kernel/sys_ni.c | |
| parent | 25268498c9e07870323aead10751b7c6e99a3a78 (diff) | |
| parent | a3d3203e4bb40f253b1541e310dc0f9305be7c84 (diff) | |
Merge branch 'linus' into timers/core
Conflicts:
Documentation/feature-removal-schedule.txt
Merge reason: Resolve the conflict, update to upstream.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/sys_ni.c')
| -rw-r--r-- | kernel/sys_ni.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/sys_ni.c b/kernel/sys_ni.c index 695384f12a7d..70f2ea758ffe 100644 --- a/kernel/sys_ni.c +++ b/kernel/sys_ni.c | |||
| @@ -126,6 +126,7 @@ cond_syscall(sys_setreuid16); | |||
| 126 | cond_syscall(sys_setuid16); | 126 | cond_syscall(sys_setuid16); |
| 127 | cond_syscall(sys_vm86old); | 127 | cond_syscall(sys_vm86old); |
| 128 | cond_syscall(sys_vm86); | 128 | cond_syscall(sys_vm86); |
| 129 | cond_syscall(sys_ipc); | ||
| 129 | cond_syscall(compat_sys_ipc); | 130 | cond_syscall(compat_sys_ipc); |
| 130 | cond_syscall(compat_sys_sysctl); | 131 | cond_syscall(compat_sys_sysctl); |
| 131 | cond_syscall(sys_flock); | 132 | cond_syscall(sys_flock); |