Commit a70d4393 authored by Jakub Bogusz's avatar Jakub Bogusz Committed by Linus Torvalds

[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: default avatarJakub Bogusz <qboosh@pld-linux.org>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ba8c6d53
...@@ -81,8 +81,10 @@ void die(const char * str, struct pt_regs * fp, long err) ...@@ -81,8 +81,10 @@ void die(const char * str, struct pt_regs * fp, long err)
console_verbose(); console_verbose();
spin_lock_irq(&die_lock); spin_lock_irq(&die_lock);
#ifdef CONFIG_PMAC_BACKLIGHT #ifdef CONFIG_PMAC_BACKLIGHT
set_backlight_enable(1); if (_machine == _MACH_Pmac) {
set_backlight_level(BACKLIGHT_MAX); set_backlight_enable(1);
set_backlight_level(BACKLIGHT_MAX);
}
#endif #endif
printk("Oops: %s, sig: %ld [#%d]\n", str, err, ++die_counter); printk("Oops: %s, sig: %ld [#%d]\n", str, err, ++die_counter);
#ifdef CONFIG_PREEMPT #ifdef CONFIG_PREEMPT
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment