The patch titled
uml: fix initrd printk
has been added to the -mm tree. Its filename is
uml-fix-initrd-printk.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: uml: fix initrd printk
From: Johann Felix Soden <johfel@xxxxxxxxxxxxxxxxxxxxx>
If the initrd file has zero-length, the error message should contain
the filepath.
Cc: WANG Cong <xiyou.wangcong@xxxxxxxxx>
Signed-off-by: Johann Felix Soden <johfel@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Jeff Dike <jdike@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/um/kernel/initrd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN arch/um/kernel/initrd.c~uml-fix-initrd-printk arch/um/kernel/initrd.c
--- a/arch/um/kernel/initrd.c~uml-fix-initrd-printk
+++ a/arch/um/kernel/initrd.c
@@ -32,7 +32,7 @@ static int __init read_initrd(void)
* ask for no memory.
*/
if (size == 0) {
- printk(KERN_ERR "\"%\" is a zero-size initrd\n");
+ printk(KERN_ERR "\"%s\" is a zero-size initrd\n", initrd);
return 0;
}
_
Patches currently in -mm which might be from johfel@xxxxxxxxxxxxxxxxxxxxx are
origin.patch
rtc-remove-unused-var-in-drivers-rtc-rtc-r9701o.patch
uml-fix-initrd-printk.patch
uml-fix-helper_wait-calls-in-watchdog.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
