diff options
author | Kay Sievers <kay@vrfy.org> | 2012-05-09 01:30:48 +0200 |
---|---|---|
committer | Kay Sievers <kay@vrfy.org> | 2012-05-09 01:30:48 +0200 |
commit | ba24d184b1d228fcfd16a041a66a5b65f7b05154 (patch) | |
tree | bb6e22152e152e0395767f0b3a4bef0ef09b0bf3 | |
parent | d767e4bff56c9a8e729b0dfa657e434e08a8d1c7 (diff) | |
download | patches-ba24d184b1d228fcfd16a041a66a5b65f7b05154.tar.gz |
update kmsg-off.patch
-rw-r--r-- | kmsg-off.patch | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/kmsg-off.patch b/kmsg-off.patch index de51afe..ccf51a0 100644 --- a/kmsg-off.patch +++ b/kmsg-off.patch @@ -3,9 +3,22 @@ Subject: printk - fix compilation for CONFIG_PRINTK=n Signed-off-by: Kay Sievers <kay@vrfy.org> --- - kernel/printk.c | 41 ++++++++++++++++++++++------------------- - 1 file changed, 22 insertions(+), 19 deletions(-) + drivers/char/mem.c | 2 ++ + kernel/printk.c | 41 ++++++++++++++++++++++------------------- + 2 files changed, 24 insertions(+), 19 deletions(-) +--- a/drivers/char/mem.c ++++ b/drivers/char/mem.c +@@ -825,7 +825,9 @@ static const struct memdev { + [7] = { "full", 0666, &full_fops, NULL }, + [8] = { "random", 0666, &random_fops, NULL }, + [9] = { "urandom", 0666, &urandom_fops, NULL }, ++#ifdef CONFIG_PRINTK + [11] = { "kmsg", 0644, &kmsg_fops, NULL }, ++#endif + #ifdef CONFIG_CRASH_DUMP + [12] = { "oldmem", 0, &oldmem_fops, NULL }, + #endif --- a/kernel/printk.c +++ b/kernel/printk.c @@ -126,7 +126,6 @@ EXPORT_SYMBOL(console_set_on_cmdline); |