From 5e37c398f108d678a6634b374a83e7175649e4fc Mon Sep 17 00:00:00 2001
From: Mike Galbraith <efault@gmx.de>
Date: Wed, 6 Dec 2006 20:37:42 -0800
Subject: [PATCH] --- yaml --- r: 42849 b: refs/heads/master c:
 c36264dfb2d6fa6383082de0a1bba8e12b477da1 h: refs/heads/master i:   42847:
 cfdbfd3c10be50d320a955994434c547359030b6 v: v3

---
 [refs]                    | 2 +-
 trunk/fs/proc/Makefile    | 3 ++-
 trunk/fs/proc/proc_misc.c | 2 ++
 trunk/kernel/printk.c     | 7 +------
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 07a0a2186a0f..b9c445c0b363 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44ddc4f5673a62c9ecdbb7b502fe7b8206b0f945
+refs/heads/master: c36264dfb2d6fa6383082de0a1bba8e12b477da1
diff --git a/trunk/fs/proc/Makefile b/trunk/fs/proc/Makefile
index 7431d7ba2d09..f6c776272572 100644
--- a/trunk/fs/proc/Makefile
+++ b/trunk/fs/proc/Makefile
@@ -8,8 +8,9 @@ proc-y			:= nommu.o task_nommu.o
 proc-$(CONFIG_MMU)	:= mmu.o task_mmu.o
 
 proc-y       += inode.o root.o base.o generic.o array.o \
-		kmsg.o proc_tty.o proc_misc.o
+		proc_tty.o proc_misc.o
 
 proc-$(CONFIG_PROC_KCORE)	+= kcore.o
 proc-$(CONFIG_PROC_VMCORE)	+= vmcore.o
 proc-$(CONFIG_PROC_DEVICETREE)	+= proc_devtree.o
+proc-$(CONFIG_PRINTK)	+= kmsg.o
diff --git a/trunk/fs/proc/proc_misc.c b/trunk/fs/proc/proc_misc.c
index 93c43b676e59..51815cece6f3 100644
--- a/trunk/fs/proc/proc_misc.c
+++ b/trunk/fs/proc/proc_misc.c
@@ -696,9 +696,11 @@ void __init proc_misc_init(void)
 	proc_symlink("mounts", NULL, "self/mounts");
 
 	/* And now for trickier ones */
+#ifdef CONFIG_PRINTK
 	entry = create_proc_entry("kmsg", S_IRUSR, &proc_root);
 	if (entry)
 		entry->proc_fops = &proc_kmsg_operations;
+#endif
 	create_seq_entry("devices", 0, &proc_devinfo_operations);
 	create_seq_entry("cpuinfo", 0, &proc_cpuinfo_operations);
 #ifdef CONFIG_BLOCK
diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c
index 66426552fbfe..ba59c2a30ed0 100644
--- a/trunk/kernel/printk.c
+++ b/trunk/kernel/printk.c
@@ -631,12 +631,7 @@ EXPORT_SYMBOL(vprintk);
 
 asmlinkage long sys_syslog(int type, char __user *buf, int len)
 {
-	return 0;
-}
-
-int do_syslog(int type, char __user *buf, int len)
-{
-	return 0;
+	return -ENOSYS;
 }
 
 static void call_console_drivers(unsigned long start, unsigned long end)