taint: add explicit flag to show whether lock dep is still OK.

Fix up all callers as they were before, with make one change: an
unsigned module taints the kernel, but doesn't turn off lockdep.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

23 files changed, 23 insertions, 24 deletions

diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c
index 272666d006df..4037461a6493 100644
--- a/arch/alpha/kernel/traps.c
+++ b/arch/alpha/kernel/traps.c
@@ -186,7 +186,7 @@ die_if_kernel(char * str, struct pt_regs *regs, long err, unsigned long *r9_15)
 #endif
         printk("%s(%d): %s %ld\n", current->comm, task_pid_nr(current), str, err);
         dik_show_regs(regs, r9_15);
-        add_taint(TAINT_DIE);
+        add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);
         dik_show_trace((unsigned long *)(regs+1));
         dik_show_code((unsigned int *)regs->pc);
 
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index b0179b89a04c..1c089119b2d7 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -296,7 +296,7 @@ static void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
 
         bust_spinlocks(0);
         die_owner = -1;
-        add_taint(TAINT_DIE);
+        add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);
         die_nest_count--;
         if (!die_nest_count)
                 /* Nest count reaches zero, release the lock. */
diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c
index 3883f842434f..b3c5f628bdb4 100644
--- a/arch/arm64/kernel/traps.c
+++ b/arch/arm64/kernel/traps.c
@@ -242,7 +242,7 @@ void die(const char *str, struct pt_regs *regs, int err)
                 crash_kexec(regs);
 
         bust_spinlocks(0);
-        add_taint(TAINT_DIE);
+        add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);
         raw_spin_unlock_irq(&die_lock);
         oops_exit();
 
diff --git a/arch/avr32/kernel/traps.c b/arch/avr32/kernel/traps.c
index 3d760c06f024..682b2478691a 100644
--- a/arch/avr32/kernel/traps.c
+++ b/arch/avr32/kernel/traps.c
@@ -61,7 +61,7 @@ void die(const char *str, struct pt_regs *regs, long err)
         show_regs_log_lvl(regs, KERN_EMERG);
         show_stack_log_lvl(current, regs->sp, regs, KERN_EMERG);
         bust_spinlocks(0);
-        add_taint(TAINT_DIE);
+        add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);
         spin_unlock_irq(&die_lock);
 
         if (in_interrupt())
diff --git a/arch/hexagon/kernel/traps.c b/arch/hexagon/kernel/traps.c
index a41eeb8eeaa1..be5e2dd9c9d3 100644
--- a/arch/hexagon/kernel/traps.c
+++ b/arch/hexagon/kernel/traps.c
@@ -225,7 +225,7 @@ int die(const char *str, struct pt_regs *regs, long err)
         do_show_stack(current, &regs->r30, pt_elr(regs));
 
         bust_spinlocks(0);
-        add_taint(TAINT_DIE);
+        add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);
 
         spin_unlock_irq(&die.lock);
 
diff --git a/arch/ia64/kernel/traps.c b/arch/ia64/kernel/traps.c
index bd42b76000d1..f7f9f9c6caf0 100644
--- a/arch/ia64/kernel/traps.c
+++ b/arch/ia64/kernel/traps.c
@@ -72,7 +72,7 @@ die (const char *str, struct pt_regs *regs, long err)
 
         bust_spinlocks(0);
         die.lock_owner = -1;
-        add_taint(TAINT_DIE);
+        add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);
         spin_unlock_irq(&die.lock);
 
         if (!regs)
diff --git a/arch/m68k/kernel/traps.c b/arch/m68k/kernel/traps.c
index cbc624af4494..f32ab22e7ed3 100644
--- a/arch/m68k/kernel/traps.c
+++ b/arch/m68k/kernel/traps.c
@@ -1176,7 +1176,7 @@ void die_if_kernel (char *str, struct pt_regs *fp, int nr)
         console_verbose();
         printk("%s: %08x\n",str,nr);
         show_registers(fp);
-        add_taint(TAINT_DIE);
+        add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);
         do_exit(SIGSEGV);
 }
 
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index cf7ac5483f53..9007966d56d4 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -396,7 +396,7 @@ void __noreturn die(const char *str, struct pt_regs *regs)
 
         printk("%s[#%d]:\n", str, ++die_counter);
         show_registers(regs);
-        add_taint(TAINT_DIE);
+        add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);
         raw_spin_unlock_irq(&die_lock);
 
         oops_exit();
diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
index 45ba99f5080b..aeb8f8f2c07a 100644
--- a/arch/parisc/kernel/traps.c
+++ b/arch/parisc/kernel/traps.c
@@ -282,7 +282,7 @@ void die_if_kernel(char *str, struct pt_regs *regs, long err)
 
         show_regs(regs);
         dump_stack();
-        add_taint(TAINT_DIE);
+        add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);
 
         if (in_interrupt())
                 panic("Fatal exception in interrupt");
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 32518401af68..c579db859388 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -138,7 +138,7 @@ static void __kprobes oops_end(unsigned long flags, struct pt_regs *regs,
 {
         bust_spinlocks(0);
         die_owner = -1;
-        add_taint(TAINT_DIE);
+        add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);
         die_nest_count--;
         oops_exit();
         printk("\n");
diff --git a/arch/s390/kernel/traps.c b/arch/s390/kernel/traps.c
index 70ecfc5fe8f0..13dd63fba367 100644
--- a/arch/s390/kernel/traps.c
+++ b/arch/s390/kernel/traps.c
@@ -271,7 +271,7 @@ void die(struct pt_regs *regs, const char *str)
         print_modules();
         show_regs(regs);
         bust_spinlocks(0);
-        add_taint(TAINT_DIE);
+        add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);
         spin_unlock_irq(&die_lock);
         if (in_interrupt())
                 panic("Fatal exception in interrupt");
diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c
index 72246bc06884..dfdad72c61ca 100644
--- a/arch/sh/kernel/traps.c
+++ b/arch/sh/kernel/traps.c
@@ -38,7 +38,7 @@ void die(const char *str, struct pt_regs *regs, long err)
         notify_die(DIE_OOPS, str, regs, err, 255, SIGSEGV);
 
         bust_spinlocks(0);
-        add_taint(TAINT_DIE);
+        add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);
         spin_unlock_irq(&die_lock);
         oops_exit();
 
diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c
index 0eaf0059aaef..88a127b9c69e 100644
--- a/arch/sparc/kernel/setup_64.c
+++ b/arch/sparc/kernel/setup_64.c
@@ -115,7 +115,7 @@ static void __init process_switch(char c)
                         break;
                 }
                 cheetah_pcache_forced_on = 1;
-                add_taint(TAINT_MACHINE_CHECK);
+                add_taint(TAINT_MACHINE_CHECK, LOCKDEP_NOW_UNRELIABLE);
                 cheetah_enable_pcache();
                 break;
 
diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
index a5785ea2a85d..662982946a89 100644
--- a/arch/sparc/kernel/traps_32.c
+++ b/arch/sparc/kernel/traps_32.c
@@ -58,7 +58,7 @@ void die_if_kernel(char *str, struct pt_regs *regs)
 
         printk("%s(%d): %s [#%d]\n", current->comm, task_pid_nr(current), str, ++die_counter);
         show_regs(regs);
-        add_taint(TAINT_DIE);
+        add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);
 
         __SAVE; __SAVE; __SAVE; __SAVE;
         __SAVE; __SAVE; __SAVE; __SAVE;
diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
index e7ecf1507d90..8d38ca97aa23 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 *)
diff --git a/arch/unicore32/kernel/traps.c b/arch/unicore32/kernel/traps.c
index 2054f0d4db13..0870b68d2ad9 100644
--- a/arch/unicore32/kernel/traps.c
+++ b/arch/unicore32/kernel/traps.c
@@ -231,7 +231,7 @@ void die(const char *str, struct pt_regs *regs, int err)
         ret = __die(str, err, thread, regs);
 
         bust_spinlocks(0);
-        add_taint(TAINT_DIE);
+        add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);
         spin_unlock_irq(&die_lock);
         oops_exit();
 
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 15239fffd6fe..5853e57523e5 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -220,8 +220,7 @@ static void __cpuinit amd_k7_smp_check(struct cpuinfo_x86 *c)
          */
         WARN_ONCE(1, "WARNING: This combination of AMD"
                 " processors is not suitable for SMP.\n");
-        if (!test_taint(TAINT_UNSAFE_SMP))
-                add_taint(TAINT_UNSAFE_SMP);
+        add_taint(TAINT_UNSAFE_SMP, LOCKDEP_NOW_UNRELIABLE);
 
 valid_k7:
         ;
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index 80dbda84f1c3..6bc15edbc8cd 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -1085,7 +1085,7 @@ void do_machine_check(struct pt_regs *regs, long error_code)
                 /*
                  * Set taint even when machine check was not enabled.
                  */
-                add_taint(TAINT_MACHINE_CHECK);
+                add_taint(TAINT_MACHINE_CHECK, LOCKDEP_NOW_UNRELIABLE);
 
                 severity = mce_severity(&m, cfg->tolerant, NULL);
 
diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
index 2d5454cd2c4f..1c044b1ccc59 100644
--- a/arch/x86/kernel/cpu/mcheck/p5.c
+++ b/arch/x86/kernel/cpu/mcheck/p5.c
@@ -33,7 +33,7 @@ static void pentium_machine_check(struct pt_regs *regs, long error_code)
                         smp_processor_id());
         }
 
-        add_taint(TAINT_MACHINE_CHECK);
+        add_taint(TAINT_MACHINE_CHECK, LOCKDEP_NOW_UNRELIABLE);
 }
 
 /* Set up machine check reporting for processors with Intel style MCE: */
diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
index 2d7998fb628c..e9a701aecaa1 100644
--- a/arch/x86/kernel/cpu/mcheck/winchip.c
+++ b/arch/x86/kernel/cpu/mcheck/winchip.c
@@ -15,7 +15,7 @@
 static void winchip_machine_check(struct pt_regs *regs, long error_code)
 {
         printk(KERN_EMERG "CPU0: Machine Check Exception.\n");
-        add_taint(TAINT_MACHINE_CHECK);
+        add_taint(TAINT_MACHINE_CHECK, LOCKDEP_NOW_UNRELIABLE);
 }
 
 /* Set up machine check reporting on the Winchip C6 series */
diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c
index e9fe907cd249..fa72a39e5d46 100644
--- a/arch/x86/kernel/cpu/mtrr/generic.c
+++ b/arch/x86/kernel/cpu/mtrr/generic.c
@@ -542,7 +542,7 @@ static void generic_get_mtrr(unsigned int reg, unsigned long *base,
 
                 if (tmp != mask_lo) {
                         printk(KERN_WARNING "mtrr: your BIOS has configured an incorrect mask, fixing it.\n");
-                        add_taint(TAINT_FIRMWARE_WORKAROUND);
+                        add_taint(TAINT_FIRMWARE_WORKAROUND, LOCKDEP_STILL_OK);
                         mask_lo = tmp;
                 }
         }
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
index ae42418bc50f..c8797d55b245 100644
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
@@ -232,7 +232,7 @@ void __kprobes oops_end(unsigned long flags, struct pt_regs *regs, int signr)
 
         bust_spinlocks(0);
         die_owner = -1;
-        add_taint(TAINT_DIE);
+        add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);
         die_nest_count--;
         if (!die_nest_count)
                 /* Nest count reaches zero, release the lock. */
diff --git a/arch/xtensa/kernel/traps.c b/arch/xtensa/kernel/traps.c
index 01e0111bf787..ded955d45155 100644
--- a/arch/xtensa/kernel/traps.c
+++ b/arch/xtensa/kernel/traps.c
@@ -524,7 +524,7 @@ void die(const char * str, struct pt_regs * regs, long err)
         if (!user_mode(regs))
                 show_stack(NULL, (unsigned long*)regs->areg[1]);
 
-        add_taint(TAINT_DIE);
+        add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE);
         spin_unlock_irq(&die_lock);
 
         if (in_interrupt())