summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2009-01-14 14:13:58 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2009-01-18 10:35:33 -0800
commit6219e3e2a1f93a1211032b942c524c5f38e6779b (patch)
tree93fbd1b4fb5e9d2a89bd5e14ab36d0a339e86a0c /kernel
parentb73c67486160c59c7b96c3a7225716b41b7bf759 (diff)
Make sys_syslog a conditional system call
commit f627a741d24f12955fa2d9f8831c3b12860635bd upstream. Remove the -ENOSYS implementation for !CONFIG_PRINTK and use the cond_syscall infrastructure instead. Acked-by: Kyle McMartin <kyle@redhat.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/printk.c5
-rw-r--r--kernel/sys_ni.c1
2 files changed, 1 insertions, 5 deletions
diff --git a/kernel/printk.c b/kernel/printk.c
index b51b1567bb55..f85edcd6a9ac 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -782,11 +782,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)
{
}
diff --git a/kernel/sys_ni.c b/kernel/sys_ni.c
index 08d6e1bb99ac..d7b7b4520655 100644
--- a/kernel/sys_ni.c
+++ b/kernel/sys_ni.c
@@ -125,6 +125,7 @@ cond_syscall(sys_vm86old);
cond_syscall(sys_vm86);
cond_syscall(compat_sys_ipc);
cond_syscall(compat_sys_sysctl);
+cond_syscall(sys_syslog);
/* arch-specific weak syscall entries */
cond_syscall(sys_pciconfig_read);