summaryrefslogtreecommitdiff
path: root/arch/m68k/kernel/head.S
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2008-05-18 22:47:13 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-19 00:28:49 +0400
commit3f365e8ee90bf835553ea964ba5accf5b8ba4070 (patch)
tree702e66f6e7d977a6efc4b9bd14ef338373f2dd2d /arch/m68k/kernel/head.S
parente8006b060f3982a969c5170aa869628d54dd30d8 (diff)
downloadlinux-3f365e8ee90bf835553ea964ba5accf5b8ba4070.tar.xz
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/kernel/head.S')
-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 faa6764f1d13..f513f530de91 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.
*/