diff options
Diffstat (limited to 'kernel/panic.c')
| -rw-r--r-- | kernel/panic.c | 21 | 
1 files changed, 3 insertions, 18 deletions
diff --git a/kernel/panic.c b/kernel/panic.c index cefd7d82366f..55b50e052ec3 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -32,6 +32,7 @@  #include <linux/bug.h>  #include <linux/ratelimit.h>  #include <linux/debugfs.h> +#include <trace/events/error_report.h>  #include <asm/sections.h>  #define PANIC_TIMER_STEP 100 @@ -533,26 +534,9 @@ void oops_enter(void)  		trigger_all_cpu_backtrace();  } -/* - * 64-bit random ID for oopses: - */ -static u64 oops_id; - -static int init_oops_id(void) -{ -	if (!oops_id) -		get_random_bytes(&oops_id, sizeof(oops_id)); -	else -		oops_id++; - -	return 0; -} -late_initcall(init_oops_id); -  static void print_oops_end_marker(void)  { -	init_oops_id(); -	pr_warn("---[ end trace %016llx ]---\n", (unsigned long long)oops_id); +	pr_warn("---[ end trace %016llx ]---\n", 0ULL);  }  /* @@ -609,6 +593,7 @@ void __warn(const char *file, int line, void *caller, unsigned taint,  	print_irqtrace_events(current);  	print_oops_end_marker(); +	trace_error_report_end(ERROR_DETECTOR_WARN, (unsigned long)caller);  	/* Just a warning, don't kill lockdep. */  	add_taint(taint, LOCKDEP_STILL_OK);  | 
