projects
/
platform
/
kernel
/
kernel-mfld-blackbay.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e8006b0
)
m68k: Correct jump if not running on HP300
author
Geert Uytterhoeven
<geert@linux-m68k.org>
Sun, 18 May 2008 18:47:13 +0000
(20:47 +0200)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Sun, 18 May 2008 20:28:49 +0000
(13:28 -0700)
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>
arch/m68k/kernel/head.S
patch
|
blob
|
history
diff --git
a/arch/m68k/kernel/head.S
b/arch/m68k/kernel/head.S
index
faa6764
..
f513f53
100644
(file)
--- 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(
1
f)
+ is_not_hp300(
2
f)
/*
* Fix up the iobase register to point to the new location of the LEDs.
*/