lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

powerpc: Convert die.lock to raw_spinlock

Browse Source 
die.lock needs to be a real spinlock in RT. Convert it to
raw_spinlock.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Thomas Gleixner
2010-02-18 02:22:31 +00:00
committed by Benjamin Herrenschmidt
parent 3eb93c558a
commit b8f87782e8
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/powerpc/kernel/traps.c
View File

@@ -102,11 +102,11 @@ static inline void pmac_backlight_unblank(void) { }
int die(const char *str, struct pt_regs *regs, long err) int die(const char *str, struct pt_regs *regs, long err)
{ {
static struct { static struct {
spinlock_t lock; raw_spinlock_t lock;
u32 lock_owner; u32 lock_owner;
int lock_owner_depth; int lock_owner_depth;
} die = { } die = {
.lock = __SPIN_LOCK_UNLOCKED(die.lock), .lock = __RAW_SPIN_LOCK_UNLOCKED(die.lock),
.lock_owner = -1, .lock_owner = -1,
.lock_owner_depth = 0 .lock_owner_depth = 0
}; };
@@ -120,7 +120,7 @@ int die(const char *str, struct pt_regs *regs, long err)
if (die.lock_owner != raw_smp_processor_id()) { if (die.lock_owner != raw_smp_processor_id()) {
console_verbose(); console_verbose();
spin_lock_irqsave(&die.lock, flags); raw_spin_lock_irqsave(&die.lock, flags);
die.lock_owner = smp_processor_id(); die.lock_owner = smp_processor_id();
die.lock_owner_depth = 0; die.lock_owner_depth = 0;
bust_spinlocks(1); bust_spinlocks(1);
@@ -160,7 +160,7 @@ int die(const char *str, struct pt_regs *regs, long err)
bust_spinlocks(0); bust_spinlocks(0);
die.lock_owner = -1; die.lock_owner = -1;
add_taint(TAINT_DIE); add_taint(TAINT_DIE);
spin_unlock_irqrestore(&die.lock, flags); raw_spin_unlock_irqrestore(&die.lock, flags);
if (kexec_should_crash(current) || if (kexec_should_crash(current) ||
kexec_sr_activated(smp_processor_id())) kexec_sr_activated(smp_processor_id()))