Remove multiple KERN_ prefixes from printk formats
Commit 5fd29d6ccb
("printk: clean up
handling of log-levels and newlines") changed printk semantics. printk
lines with multiple KERN_<level> prefixes are no longer emitted as
before the patch.
<level> is now included in the output on each additional use.
Remove all uses of multiple KERN_<level>s in formats.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Tento commit je obsažen v:
@@ -156,7 +156,7 @@ void machine_power_off(void)
|
||||
* software. The user has to press the button himself. */
|
||||
|
||||
printk(KERN_EMERG "System shut down completed.\n"
|
||||
KERN_EMERG "Please power this system off now.");
|
||||
"Please power this system off now.");
|
||||
}
|
||||
|
||||
void (*pm_power_off)(void) = machine_power_off;
|
||||
|
@@ -250,15 +250,14 @@ void die_if_kernel(char *str, struct pt_regs *regs, long err)
|
||||
oops_enter();
|
||||
|
||||
/* Amuse the user in a SPARC fashion */
|
||||
if (err) printk(
|
||||
KERN_CRIT " _______________________________ \n"
|
||||
KERN_CRIT " < Your System ate a SPARC! Gah! >\n"
|
||||
KERN_CRIT " ------------------------------- \n"
|
||||
KERN_CRIT " \\ ^__^\n"
|
||||
KERN_CRIT " \\ (xx)\\_______\n"
|
||||
KERN_CRIT " (__)\\ )\\/\\\n"
|
||||
KERN_CRIT " U ||----w |\n"
|
||||
KERN_CRIT " || ||\n");
|
||||
if (err) printk(KERN_CRIT
|
||||
" _______________________________ \n"
|
||||
" < Your System ate a SPARC! Gah! >\n"
|
||||
" ------------------------------- \n"
|
||||
" \\ ^__^\n"
|
||||
" (__)\\ )\\/\\\n"
|
||||
" U ||----w |\n"
|
||||
" || ||\n");
|
||||
|
||||
/* unlock the pdc lock if necessary */
|
||||
pdc_emergency_unlock();
|
||||
@@ -797,7 +796,8 @@ void notrace handle_interruption(int code, struct pt_regs *regs)
|
||||
else
|
||||
printk(KERN_DEBUG "User Fault (long pointer) (fault %d) ",
|
||||
code);
|
||||
printk("pid=%d command='%s'\n", task_pid_nr(current), current->comm);
|
||||
printk(KERN_CONT "pid=%d command='%s'\n",
|
||||
task_pid_nr(current), current->comm);
|
||||
show_regs(regs);
|
||||
#endif
|
||||
si.si_signo = SIGSEGV;
|
||||
|
Odkázat v novém úkolu
Zablokovat Uživatele