|
@@ -90,7 +90,7 @@ static void sysrq_handle_loglevel(int key)
|
|
|
|
|
|
i = key - '0';
|
|
i = key - '0';
|
|
console_loglevel = CONSOLE_LOGLEVEL_DEFAULT;
|
|
console_loglevel = CONSOLE_LOGLEVEL_DEFAULT;
|
|
- printk("Loglevel set to %d\n", i);
|
|
|
|
|
|
+ pr_info("Loglevel set to %d\n", i);
|
|
console_loglevel = i;
|
|
console_loglevel = i;
|
|
}
|
|
}
|
|
static struct sysrq_key_op sysrq_loglevel_op = {
|
|
static struct sysrq_key_op sysrq_loglevel_op = {
|
|
@@ -220,7 +220,7 @@ static void showacpu(void *dummy)
|
|
return;
|
|
return;
|
|
|
|
|
|
spin_lock_irqsave(&show_lock, flags);
|
|
spin_lock_irqsave(&show_lock, flags);
|
|
- printk(KERN_INFO "CPU%d:\n", smp_processor_id());
|
|
|
|
|
|
+ pr_info("CPU%d:\n", smp_processor_id());
|
|
show_stack(NULL, NULL);
|
|
show_stack(NULL, NULL);
|
|
spin_unlock_irqrestore(&show_lock, flags);
|
|
spin_unlock_irqrestore(&show_lock, flags);
|
|
}
|
|
}
|
|
@@ -243,7 +243,7 @@ static void sysrq_handle_showallcpus(int key)
|
|
struct pt_regs *regs = get_irq_regs();
|
|
struct pt_regs *regs = get_irq_regs();
|
|
|
|
|
|
if (regs) {
|
|
if (regs) {
|
|
- printk(KERN_INFO "CPU%d:\n", smp_processor_id());
|
|
|
|
|
|
+ pr_info("CPU%d:\n", smp_processor_id());
|
|
show_regs(regs);
|
|
show_regs(regs);
|
|
}
|
|
}
|
|
schedule_work(&sysrq_showallcpus);
|
|
schedule_work(&sysrq_showallcpus);
|
|
@@ -522,7 +522,7 @@ void __handle_sysrq(int key, bool check_mask)
|
|
*/
|
|
*/
|
|
orig_log_level = console_loglevel;
|
|
orig_log_level = console_loglevel;
|
|
console_loglevel = CONSOLE_LOGLEVEL_DEFAULT;
|
|
console_loglevel = CONSOLE_LOGLEVEL_DEFAULT;
|
|
- printk(KERN_INFO "SysRq : ");
|
|
|
|
|
|
+ pr_info("SysRq : ");
|
|
|
|
|
|
op_p = __sysrq_get_key_op(key);
|
|
op_p = __sysrq_get_key_op(key);
|
|
if (op_p) {
|
|
if (op_p) {
|
|
@@ -531,14 +531,14 @@ void __handle_sysrq(int key, bool check_mask)
|
|
* should not) and is the invoked operation enabled?
|
|
* should not) and is the invoked operation enabled?
|
|
*/
|
|
*/
|
|
if (!check_mask || sysrq_on_mask(op_p->enable_mask)) {
|
|
if (!check_mask || sysrq_on_mask(op_p->enable_mask)) {
|
|
- printk("%s\n", op_p->action_msg);
|
|
|
|
|
|
+ pr_cont("%s\n", op_p->action_msg);
|
|
console_loglevel = orig_log_level;
|
|
console_loglevel = orig_log_level;
|
|
op_p->handler(key);
|
|
op_p->handler(key);
|
|
} else {
|
|
} else {
|
|
- printk("This sysrq operation is disabled.\n");
|
|
|
|
|
|
+ pr_cont("This sysrq operation is disabled.\n");
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
- printk("HELP : ");
|
|
|
|
|
|
+ pr_cont("HELP : ");
|
|
/* Only print the help msg once per handler */
|
|
/* Only print the help msg once per handler */
|
|
for (i = 0; i < ARRAY_SIZE(sysrq_key_table); i++) {
|
|
for (i = 0; i < ARRAY_SIZE(sysrq_key_table); i++) {
|
|
if (sysrq_key_table[i]) {
|
|
if (sysrq_key_table[i]) {
|
|
@@ -549,10 +549,10 @@ void __handle_sysrq(int key, bool check_mask)
|
|
;
|
|
;
|
|
if (j != i)
|
|
if (j != i)
|
|
continue;
|
|
continue;
|
|
- printk("%s ", sysrq_key_table[i]->help_msg);
|
|
|
|
|
|
+ pr_cont("%s ", sysrq_key_table[i]->help_msg);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- printk("\n");
|
|
|
|
|
|
+ pr_cont("\n");
|
|
console_loglevel = orig_log_level;
|
|
console_loglevel = orig_log_level;
|
|
}
|
|
}
|
|
rcu_read_unlock();
|
|
rcu_read_unlock();
|