summaryrefslogtreecommitdiffstats
path: root/arch/um/defconfig
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2007-10-16 01:27:17 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-16 09:43:07 -0700
commit54fa0ba40698af6d6735ade024293bb51cc4d4b3 (patch)
treea6280ede4f15462316660831cf26ef7394b60b6a /arch/um/defconfig
parent058ac308f3dd34ce4e2dbf938258975ced14b809 (diff)
downloadlinux-stable-54fa0ba40698af6d6735ade024293bb51cc4d4b3.tar.gz
linux-stable-54fa0ba40698af6d6735ade024293bb51cc4d4b3.tar.bz2
linux-stable-54fa0ba40698af6d6735ade024293bb51cc4d4b3.zip
uml: sysrq and mconsole fixes
Fix the passing of printk output back to the mconsole client. The existing code was somewhat confused, accumulating output in a buffer, but writing it out entirely whenever a new chunk was added. This is fixed. The earlier include cleanups caused linux/sysrq.h to not be included - this is fixed by adding the include back, under CONFIG_MAGIC_SYSRQ. CONFIG_MAGIC_SYSRQ is also defaulted to on in defconfig. Signed-off-by: Jeff Dike <jdike@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/defconfig')
-rw-r--r--arch/um/defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/defconfig b/arch/um/defconfig
index ed3196d8c908..658f65446c56 100644
--- a/arch/um/defconfig
+++ b/arch/um/defconfig
@@ -80,7 +80,7 @@ CONFIG_BINFMT_MISC=m
# CONFIG_HOSTFS is not set
# CONFIG_HPPFS is not set
CONFIG_MCONSOLE=y
-# CONFIG_MAGIC_SYSRQ is not set
+CONFIG_MAGIC_SYSRQ=y
CONFIG_NEST_LEVEL=0
# CONFIG_HIGHMEM is not set
CONFIG_KERNEL_STACK_ORDER=0