lkml.org 
[lkml]   [2009]   [Mar]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] initramfs: prevent initramfs printk message being split by messages from other code.
Date
initramfs uses printk without a linefeed, then does some work, then uses printk
to finish the message off. However if some other code does a printk in between,
then the messages get mixed together. Better for each message to be an independent
line...

Example of problem that this fixes:
checking if image is initramfs...<7>Switched to high resolution mode on CPU 1
Switched to high resolution mode on CPU 0
it is

Signed-off-by: Simon Kitching <skitching@apache.org>
---
init/initramfs.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/init/initramfs.c b/init/initramfs.c
index d9c941c..948a2c6 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -583,17 +583,18 @@ static int __init populate_rootfs(void)
if (initrd_start) {
#ifdef CONFIG_BLK_DEV_RAM
int fd;
- printk(KERN_INFO "checking if image is initramfs...");
+ printk(KERN_INFO "Checking if rootfs image is initramfs...\n");
err = unpack_to_rootfs((char *)initrd_start,
initrd_end - initrd_start, 1);
if (!err) {
- printk(" it is\n");
+ printk(KERN_INFO "rootfs image is initramfs; unpacking...\n");
unpack_to_rootfs((char *)initrd_start,
initrd_end - initrd_start, 0);
free_initrd();
return 0;
}
- printk("it isn't (%s); looks like an initrd\n", err);
+ printk(KERN_INFO "rootfs image is not initramfs (%s)"
+ "; looks like an initrd\n", err);
fd = sys_open("/initrd.image", O_WRONLY|O_CREAT, 0700);
if (fd >= 0) {
sys_write(fd, (char *)initrd_start,
--
1.6.0.4


\
 
 \ /
  Last update: 2009-03-20 21:37    [W:0.024 / U:0.480 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site