diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-12 07:08:57 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-12 07:08:57 -0500 |
| commit | 871cafcc962fa1655c44b4f0e54d4c5cc14e273c (patch) | |
| tree | fdb7bc65d2606c85b7be6c33ba0dfd5b4e472245 /kernel/sys_ni.c | |
| parent | cf2592f59c0e8ed4308adbdb2e0a88655379d579 (diff) | |
| parent | b578f3fcca1e78624dfb5f358776e63711d7fda2 (diff) | |
Merge branch 'linus' into core/softlockup
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 e14a23281707..27dad2967387 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); |