* [merged] ramoops-add-new-line-to-each-print.patch removed from -mm tree
@ 2011-07-27 19:29 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2011-07-27 19:29 UTC (permalink / raw)
To: marco.stornelli, joe, kyungmin.park, stevie.trujillo,
xiyou.wangcong, mm-commits
The patch titled
ramoops: add new line to each print
has been removed from the -mm tree. Its filename was
ramoops-add-new-line-to-each-print.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: ramoops: add new line to each print
From: Marco Stornelli <marco.stornelli@gmail.com>
Add new line to each print.
Signed-off-by: Marco Stornelli <marco.stornelli@gmail.com>
Reported-by: Stevie Trujillo <stevie.trujillo@gmail.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Américo Wang <xiyou.wangcong@gmail.com>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
drivers/char/ramoops.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff -puN drivers/char/ramoops.c~ramoops-add-new-line-to-each-print drivers/char/ramoops.c
--- a/drivers/char/ramoops.c~ramoops-add-new-line-to-each-print
+++ a/drivers/char/ramoops.c
@@ -19,6 +19,8 @@
*
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/kmsg_dump.h>
@@ -111,14 +113,14 @@ static int __init ramoops_probe(struct p
int err = -EINVAL;
if (!pdata->mem_size) {
- printk(KERN_ERR "ramoops: invalid size specification");
+ pr_err("invalid size specification\n");
goto fail3;
}
rounddown_pow_of_two(pdata->mem_size);
if (pdata->mem_size < RECORD_SIZE) {
- printk(KERN_ERR "ramoops: size too small");
+ pr_err("size too small\n");
goto fail3;
}
@@ -128,21 +130,21 @@ static int __init ramoops_probe(struct p
cxt->phys_addr = pdata->mem_address;
if (!request_mem_region(cxt->phys_addr, cxt->size, "ramoops")) {
- printk(KERN_ERR "ramoops: request mem region failed");
+ pr_err("request mem region failed\n");
err = -EINVAL;
goto fail3;
}
cxt->virt_addr = ioremap(cxt->phys_addr, cxt->size);
if (!cxt->virt_addr) {
- printk(KERN_ERR "ramoops: ioremap failed");
+ pr_err("ioremap failed\n");
goto fail2;
}
cxt->dump.dump = ramoops_do_dump;
err = kmsg_dump_register(&cxt->dump);
if (err) {
- printk(KERN_ERR "ramoops: registering kmsg dumper failed");
+ pr_err("registering kmsg dumper failed\n");
goto fail1;
}
@@ -161,7 +163,7 @@ static int __exit ramoops_remove(struct
struct ramoops_context *cxt = &oops_cxt;
if (kmsg_dump_unregister(&cxt->dump) < 0)
- printk(KERN_WARNING "ramoops: could not unregister kmsg_dumper");
+ pr_warn("could not unregister kmsg_dumper\n");
iounmap(cxt->virt_addr);
release_mem_region(cxt->phys_addr, cxt->size);
@@ -185,6 +187,7 @@ static int __init ramoops_init(void)
* If we didn't find a platform device, we use module parameters
* building platform data on the fly.
*/
+ pr_info("platform device not found, using module parameters\n");
dummy_data = kzalloc(sizeof(struct ramoops_platform_data),
GFP_KERNEL);
if (!dummy_data)
_
Patches currently in -mm which might be from marco.stornelli@gmail.com are
origin.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-07-27 19:28 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-07-27 19:29 [merged] ramoops-add-new-line-to-each-print.patch removed from -mm tree akpm
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.