diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2013-01-21 01:47:39 -0500 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2013-01-21 01:47:57 -0500 |
commit | 373d4d099761cb1f637bed488ab3871945882273 (patch) | |
tree | 954bef7bc724aee105dd246d5f2b1ea04ed38b20 /arch/sparc/kernel | |
parent | 64748a2c9062da0c32b59c1b368a86fc4613b1e1 (diff) |
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>
Diffstat (limited to 'arch/sparc/kernel')
-rw-r--r-- | arch/sparc/kernel/setup_64.c | 2 | ||||
-rw-r--r-- | arch/sparc/kernel/traps_32.c | 2 | ||||
-rw-r--r-- | arch/sparc/kernel/traps_64.c | 2 |
3 files changed, 3 insertions, 3 deletions
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) | |||
115 | break; | 115 | break; |
116 | } | 116 | } |
117 | cheetah_pcache_forced_on = 1; | 117 | cheetah_pcache_forced_on = 1; |
118 | add_taint(TAINT_MACHINE_CHECK); | 118 | add_taint(TAINT_MACHINE_CHECK, LOCKDEP_NOW_UNRELIABLE); |
119 | cheetah_enable_pcache(); | 119 | cheetah_enable_pcache(); |
120 | break; | 120 | break; |
121 | 121 | ||
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) | |||
58 | 58 | ||
59 | printk("%s(%d): %s [#%d]\n", current->comm, task_pid_nr(current), str, ++die_counter); | 59 | printk("%s(%d): %s [#%d]\n", current->comm, task_pid_nr(current), str, ++die_counter); |
60 | show_regs(regs); | 60 | show_regs(regs); |
61 | add_taint(TAINT_DIE); | 61 | add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE); |
62 | 62 | ||
63 | __SAVE; __SAVE; __SAVE; __SAVE; | 63 | __SAVE; __SAVE; __SAVE; __SAVE; |
64 | __SAVE; __SAVE; __SAVE; __SAVE; | 64 | __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) | |||
2383 | notify_die(DIE_OOPS, str, regs, 0, 255, SIGSEGV); | 2383 | notify_die(DIE_OOPS, str, regs, 0, 255, SIGSEGV); |
2384 | __asm__ __volatile__("flushw"); | 2384 | __asm__ __volatile__("flushw"); |
2385 | show_regs(regs); | 2385 | show_regs(regs); |
2386 | add_taint(TAINT_DIE); | 2386 | add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE); |
2387 | if (regs->tstate & TSTATE_PRIV) { | 2387 | if (regs->tstate & TSTATE_PRIV) { |
2388 | struct thread_info *tp = current_thread_info(); | 2388 | struct thread_info *tp = current_thread_info(); |
2389 | struct reg_window *rw = (struct reg_window *) | 2389 | struct reg_window *rw = (struct reg_window *) |