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>
		
	
			
		
			
				
	
	
		
			78 lines
		
	
	
	
		
			1.7 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			78 lines
		
	
	
	
		
			1.7 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
 | 
						|
 * Licensed under the GPL
 | 
						|
 */
 | 
						|
 | 
						|
#include <linux/kallsyms.h>
 | 
						|
#include <linux/kernel.h>
 | 
						|
#include <linux/module.h>
 | 
						|
#include <linux/sched.h>
 | 
						|
#include "sysrq.h"
 | 
						|
 | 
						|
/* Catch non-i386 SUBARCH's. */
 | 
						|
#if !defined(CONFIG_UML_X86) || defined(CONFIG_64BIT)
 | 
						|
void show_trace(struct task_struct *task, unsigned long * stack)
 | 
						|
{
 | 
						|
	unsigned long addr;
 | 
						|
 | 
						|
	if (!stack) {
 | 
						|
		stack = (unsigned long*) &stack;
 | 
						|
		WARN_ON(1);
 | 
						|
	}
 | 
						|
 | 
						|
	printk(KERN_INFO "Call Trace: \n");
 | 
						|
	while (((long) stack & (THREAD_SIZE-1)) != 0) {
 | 
						|
		addr = *stack;
 | 
						|
		if (__kernel_text_address(addr)) {
 | 
						|
			printk(KERN_INFO "%08lx:  [<%08lx>]",
 | 
						|
			       (unsigned long) stack, addr);
 | 
						|
			print_symbol(KERN_CONT " %s", addr);
 | 
						|
			printk(KERN_CONT "\n");
 | 
						|
		}
 | 
						|
		stack++;
 | 
						|
	}
 | 
						|
	printk(KERN_INFO "\n");
 | 
						|
}
 | 
						|
#endif
 | 
						|
 | 
						|
/*
 | 
						|
 * stack dumps generator - this is used by arch-independent code.
 | 
						|
 * And this is identical to i386 currently.
 | 
						|
 */
 | 
						|
void dump_stack(void)
 | 
						|
{
 | 
						|
	unsigned long stack;
 | 
						|
 | 
						|
	show_trace(current, &stack);
 | 
						|
}
 | 
						|
EXPORT_SYMBOL(dump_stack);
 | 
						|
 | 
						|
/*Stolen from arch/i386/kernel/traps.c */
 | 
						|
static const int kstack_depth_to_print = 24;
 | 
						|
 | 
						|
/* This recently started being used in arch-independent code too, as in
 | 
						|
 * kernel/sched.c.*/
 | 
						|
void show_stack(struct task_struct *task, unsigned long *esp)
 | 
						|
{
 | 
						|
	unsigned long *stack;
 | 
						|
	int i;
 | 
						|
 | 
						|
	if (esp == NULL) {
 | 
						|
		if (task != current && task != NULL) {
 | 
						|
			esp = (unsigned long *) KSTK_ESP(task);
 | 
						|
		} else {
 | 
						|
			esp = (unsigned long *) &esp;
 | 
						|
		}
 | 
						|
	}
 | 
						|
 | 
						|
	stack = esp;
 | 
						|
	for (i = 0; i < kstack_depth_to_print; i++) {
 | 
						|
		if (kstack_end(stack))
 | 
						|
			break;
 | 
						|
		if (i && ((i % 8) == 0))
 | 
						|
			printk(KERN_INFO "       ");
 | 
						|
		printk(KERN_CONT "%08lx ", *stack++);
 | 
						|
	}
 | 
						|
 | 
						|
	show_trace(task, esp);
 | 
						|
}
 |