2014-01-27 09:52:01

by Jiri Slaby

Subject: [PATCH 1/2] x86: dumpstack, use pr_cont

When dumping flags with which the kernel was built, we print them one
by one in separate printks. Let's use pr_cont as they are
continuation prints.

Signed-off-by: Jiri Slaby <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: "H. Peter Anvin" <[email protected]>
Cc: [email protected]
---
arch/x86/kernel/dumpstack.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
index d9c12d3022a7..8bd36be26609 100644
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
@@ -257,15 +257,15 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err)
printk(KERN_DEFAULT
"%s: %04lx [#%d] ", str, err & 0xffff, ++die_counter);
#ifdef CONFIG_PREEMPT
- printk("PREEMPT ");
+ pr_cont("PREEMPT ");
#endif
#ifdef CONFIG_SMP
- printk("SMP ");
+ pr_cont("SMP ");
#endif
#ifdef CONFIG_DEBUG_PAGEALLOC
- printk("DEBUG_PAGEALLOC");
+ pr_cont("DEBUG_PAGEALLOC");
#endif
- printk("\n");
+ pr_cont("\n");
if (notify_die(DIE_OOPS, str, regs, err,
current->thread.trap_nr, SIGSEGV) == NOTIFY_STOP)
return 1;
--
1.8.5.2

2014-01-27 09:53:20

by Jiri Slaby

Subject: [PATCH 2/2] module: use pr_cont

When dumping loaded modules, we print them one by one in separate
printks. Let's use pr_cont as they are continuation prints.

Signed-off-by: Jiri Slaby <[email protected]>
Cc: Rusty Russell <[email protected]>
---
kernel/module.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kernel/module.c b/kernel/module.c
index 4e9878eeb86c..7b4f69fff111 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -3809,12 +3809,12 @@ void print_modules(void)
list_for_each_entry_rcu(mod, &modules, list) {
if (mod->state == MODULE_STATE_UNFORMED)
continue;
- printk(" %s%s", mod->name, module_flags(mod, buf));
+ pr_cont(" %s%s", mod->name, module_flags(mod, buf));
}
preempt_enable();
if (last_unloaded_module[0])
- printk(" [last unloaded: %s]", last_unloaded_module);
- printk("\n");
+ pr_cont(" [last unloaded: %s]", last_unloaded_module);
+ pr_cont("\n");
}

#ifdef CONFIG_MODVERSIONS
--
1.8.5.2

2014-01-27 11:45:53

by Rusty Russell

Subject: Re: [PATCH 2/2] module: use pr_cont

Jiri Slaby <[email protected]> writes:
> When dumping loaded modules, we print them one by one in separate
> printks. Let's use pr_cont as they are continuation prints.

Applied.

Thanks,
Rusty.