aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2008-05-18 20:47:13 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-18 13:28:49 -0700
commit3f365e8ee90bf835553ea964ba5accf5b8ba4070 (patch)
tree702e66f6e7d977a6efc4b9bd14ef338373f2dd2d /arch/m68k
parente8006b060f3982a969c5170aa869628d54dd30d8 (diff)
downloadkernel_samsung_espresso10-3f365e8ee90bf835553ea964ba5accf5b8ba4070.zip
kernel_samsung_espresso10-3f365e8ee90bf835553ea964ba5accf5b8ba4070.tar.gz
kernel_samsung_espresso10-3f365e8ee90bf835553ea964ba5accf5b8ba4070.tar.bz2
m68k: Correct jump if not running on HP300
When running a HP300-enabled kernel on non-HP300 hardware, a test in the early startup code jumps to the wrong label, causing a double bus fault. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/kernel/head.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/kernel/head.S b/arch/m68k/kernel/head.S
index faa6764..f513f53 100644
--- a/arch/m68k/kernel/head.S
+++ b/arch/m68k/kernel/head.S
@@ -1434,7 +1434,7 @@ L(mmu_fixup_done):
#endif
#ifdef CONFIG_HP300
- is_not_hp300(1f)
+ is_not_hp300(2f)
/*
* Fix up the iobase register to point to the new location of the LEDs.
*/