| From fb17c12de1f8411244cbfaa7bfd21ea7337f517f Mon Sep 17 00:00:00 2001 |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Sat, 25 Jul 2009 16:08:10 +0200 |
| Subject: [PATCH] softlockup: Convert to raw_spinlock |
| |
| commit b20de918527a9c1558b3e8a02f935cf4cb53e3ba in tip. |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/kernel/softlockup.c b/kernel/softlockup.c |
| index 0d4c789..bbaeac5 100644 |
| --- a/kernel/softlockup.c |
| +++ b/kernel/softlockup.c |
| @@ -20,7 +20,7 @@ |
| |
| #include <asm/irq_regs.h> |
| |
| -static DEFINE_SPINLOCK(print_lock); |
| +static DEFINE_RAW_SPINLOCK(print_lock); |
| |
| static DEFINE_PER_CPU(unsigned long, softlockup_touch_ts); /* touch timestamp */ |
| static DEFINE_PER_CPU(unsigned long, softlockup_print_ts); /* print timestamp */ |
| @@ -164,7 +164,7 @@ void softlockup_tick(void) |
| |
| per_cpu(softlockup_print_ts, this_cpu) = touch_ts; |
| |
| - spin_lock(&print_lock); |
| + raw_spin_lock(&print_lock); |
| printk(KERN_ERR "BUG: soft lockup - CPU#%d stuck for %lus! [%s:%d]\n", |
| this_cpu, now - touch_ts, |
| current->comm, task_pid_nr(current)); |
| @@ -174,7 +174,7 @@ void softlockup_tick(void) |
| show_regs(regs); |
| else |
| dump_stack(); |
| - spin_unlock(&print_lock); |
| + raw_spin_unlock(&print_lock); |
| |
| if (softlockup_panic) |
| panic("softlockup: hung tasks"); |
| -- |
| 1.7.1.1 |
| |
