diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-01-25 11:54:33 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-01-25 11:54:33 +0100 |
| commit | 5b74f9e0e005baf12a2df6aaeef7d7134137792b (patch) | |
| tree | d3cef2c8c91fb415533e028bf55cc348d8818431 /kernel/printk.c | |
| parent | e3ee1e123183ca9847e74b7b8e2694c9e3b817a6 (diff) | |
| parent | f3b8436ad9a8ad36b3c9fa1fe030c7f38e5d3d0b (diff) | |
Merge branch 'linus' into timers/hrtimers
Diffstat (limited to 'kernel/printk.c')
| -rw-r--r-- | kernel/printk.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/kernel/printk.c b/kernel/printk.c index 7015733793e..69188f226a9 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -382,7 +382,7 @@ out: return error; } -asmlinkage long sys_syslog(int type, char __user *buf, int len) +SYSCALL_DEFINE3(syslog, int, type, char __user *, buf, int, len) { return do_syslog(type, buf, len); } @@ -742,11 +742,6 @@ EXPORT_SYMBOL(vprintk); #else -asmlinkage long sys_syslog(int type, char __user *buf, int len) -{ - return -ENOSYS; -} - static void call_console_drivers(unsigned start, unsigned end) { } |