Merge tag 'metag-v3.9-rc1-v4' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan...

[profile/ivi/kernel-x86-ivi.git] / arch / metag / kernel / traps.c

diff --git a/arch/metag/kernel/traps.c b/arch/metag/kernel/traps.c
index 5cad156..8961f24 100644 (file)
--- a/arch/metag/kernel/traps.c
+++ b/arch/metag/kernel/traps.c
@@ -107,7 +107,7 @@ void die(const char *str, struct pt_regs *regs, long err,
               task_pid_nr(current), task_stack_page(current) + THREAD_SIZE);
 
        bust_spinlocks(0);
-       add_taint(TAINT_DIE);
+       add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);
        if (kexec_should_crash(current))
                crash_kexec(regs);