diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-03-27 14:02:27 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-03-27 14:02:27 +0100 |
| commit | b3fecf8cab6441527ab057c99d7e6a6d7f6713e5 (patch) | |
| tree | d327499840a25fbd1f81e49d5cb6769bdad382f5 /arch/sparc/kernel/traps_64.c | |
| parent | 5b62efd8250d6a751c31d1972e96bfccd19c4679 (diff) | |
| parent | 83a44ac8bf4a8e6cbbf0c00ff281a482778f708a (diff) | |
Merge branch 'for-3.10/hid-driver-transport-cleanups' into for-3.10/mt-hybrid-finger-pen
Diffstat (limited to 'arch/sparc/kernel/traps_64.c')
| -rw-r--r-- | arch/sparc/kernel/traps_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c index e7ecf1507d9..8d38ca97aa2 100644 --- a/arch/sparc/kernel/traps_64.c +++ b/arch/sparc/kernel/traps_64.c @@ -2383,7 +2383,7 @@ void die_if_kernel(char *str, struct pt_regs *regs) notify_die(DIE_OOPS, str, regs, 0, 255, SIGSEGV); __asm__ __volatile__("flushw"); show_regs(regs); - add_taint(TAINT_DIE); + add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE); if (regs->tstate & TSTATE_PRIV) { struct thread_info *tp = current_thread_info(); struct reg_window *rw = (struct reg_window *) |