Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74853dba authored by Arjan van de Ven's avatar Arjan van de Ven Committed by Ingo Molnar
Browse files

debug warnings: consolidate warn_slowpath and warn_on_slowpath 



Impact: cleanup, code reduction

warn_slowpath is a superset of warn_on_slowpath; just have
warn_on_slowpath call warn_slowpath with a NULL 3rd argument.

Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 7fbb8759

kernel/panic.c

+12 −20
Original line number Original line Diff line number Diff line
@@ -320,23 +320,6 @@ void oops_exit(void) 
}

}





#ifdef WANT_WARN_ON_SLOWPATH

#ifdef WANT_WARN_ON_SLOWPATH

void warn_on_slowpath(const char *file, int line)

{

	char function[KSYM_SYMBOL_LEN];

	unsigned long caller = (unsigned long) __builtin_return_address(0);

	sprint_symbol(function, caller);



	printk(KERN_WARNING "------------[ cut here ]------------\n");

	printk(KERN_WARNING "WARNING: at %s:%d %s()\n", file,

		line, function);

	print_modules();

	dump_stack();

	print_oops_end_marker();

	add_taint(TAINT_WARN);

}

EXPORT_SYMBOL(warn_on_slowpath);





void warn_slowpath(const char *file, int line, const char *fmt, ...)

void warn_slowpath(const char *file, int line, const char *fmt, ...)

{

{

	va_list args;

	va_list args;
@@ -347,9 +330,12 @@ void warn_slowpath(const char *file, int line, const char *fmt, ...) 
	printk(KERN_WARNING "------------[ cut here ]------------\n");

	printk(KERN_WARNING "------------[ cut here ]------------\n");

	printk(KERN_WARNING "WARNING: at %s:%d %s()\n", file,

	printk(KERN_WARNING "WARNING: at %s:%d %s()\n", file,

		line, function);

		line, function);



	if (fmt) {

		va_start(args, fmt);

		va_start(args, fmt);

		vprintk(fmt, args);

		vprintk(fmt, args);

		va_end(args);

		va_end(args);

	}





	print_modules();

	print_modules();

	dump_stack();

	dump_stack();
@@ -357,6 +343,12 @@ void warn_slowpath(const char *file, int line, const char *fmt, ...) 
	add_taint(TAINT_WARN);

	add_taint(TAINT_WARN);

}

}

EXPORT_SYMBOL(warn_slowpath);

EXPORT_SYMBOL(warn_slowpath);



void warn_on_slowpath(const char *file, int line)

{

	warn_slowpath(file, line, NULL);

}

EXPORT_SYMBOL(warn_on_slowpath);

#endif

#endif





#ifdef CONFIG_CC_STACKPROTECTOR

#ifdef CONFIG_CC_STACKPROTECTOR