summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Bogusz <qboosh@pld-linux.org>2005-06-21 17:15:29 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-21 18:46:25 -0700
commita70d439345875d476ede258094356e2acd09b1a1 (patch)
tree0c5d63edbc020104cac05e444c4527d8bc78e857
parentba8c6d534a0144375f910e764ec965d5e8059f7a (diff)
downloadop-kernel-dev-a70d439345875d476ede258094356e2acd09b1a1.zip
op-kernel-dev-a70d439345875d476ede258094356e2acd09b1a1.tar.gz
[PATCH] ppc32: don't recursively crash in die() on CHRP/PReP machines
This patch avoids recursive crash (leading to kernel stack overflow) in die() on CHRP/PReP machines when CONFIG_PMAC_BACKLIGHT=y. set_backlight_* functions are placed in pmac section, which is discarded when _machine != _MACH_Pmac. Signed-off-by: Jakub Bogusz <qboosh@pld-linux.org> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/ppc/kernel/traps.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/ppc/kernel/traps.c b/arch/ppc/kernel/traps.c
index c65731e..2ca8ecf 100644
--- a/arch/ppc/kernel/traps.c
+++ b/arch/ppc/kernel/traps.c
@@ -81,8 +81,10 @@ void die(const char * str, struct pt_regs * fp, long err)
console_verbose();
spin_lock_irq(&die_lock);
#ifdef CONFIG_PMAC_BACKLIGHT
- set_backlight_enable(1);
- set_backlight_level(BACKLIGHT_MAX);
+ if (_machine == _MACH_Pmac) {
+ set_backlight_enable(1);
+ set_backlight_level(BACKLIGHT_MAX);
+ }
#endif
printk("Oops: %s, sig: %ld [#%d]\n", str, err, ++die_counter);
#ifdef CONFIG_PREEMPT
OpenPOWER on IntegriCloud