diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-21 10:37:27 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-21 10:37:27 -0500 |
| commit | 77835492ed489c0b870f82f4c50687bd267acc0a (patch) | |
| tree | d80903ce1b8dd30aa44ccfc756616ad4d6c74d63 /kernel/sys_ni.c | |
| parent | af37501c792107c2bde1524bdae38d9a247b841a (diff) | |
| parent | 1de9e8e70f5acc441550ca75433563d91b269bbe (diff) | |
Merge commit 'v2.6.29-rc2' into perfcounters/core
Conflicts:
include/linux/syscalls.h
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 4be8bbc7577c..68320f6b07b5 100644 --- a/kernel/sys_ni.c +++ b/kernel/sys_ni.c | |||
| @@ -131,6 +131,7 @@ cond_syscall(sys_io_destroy); | |||
| 131 | cond_syscall(sys_io_submit); | 131 | cond_syscall(sys_io_submit); |
| 132 | cond_syscall(sys_io_cancel); | 132 | cond_syscall(sys_io_cancel); |
| 133 | cond_syscall(sys_io_getevents); | 133 | cond_syscall(sys_io_getevents); |
| 134 | cond_syscall(sys_syslog); | ||
| 134 | 135 | ||
| 135 | /* arch-specific weak syscall entries */ | 136 | /* arch-specific weak syscall entries */ |
| 136 | cond_syscall(sys_pciconfig_read); | 137 | cond_syscall(sys_pciconfig_read); |