m68k: Correct jump if not running on HP300

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: <git-commits-head@...>
Date: Sunday, May 18, 2008 - 6:01 pm

Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=3f365e...
Commit:     3f365e8ee90bf835553ea964ba5accf5b8ba4070
Parent:     e8006b060f3982a969c5170aa869628d54dd30d8
Author:     Geert Uytterhoeven <geert@linux-m68k.org>
AuthorDate: Sun May 18 20:47:13 2008 +0200
Committer:  Linus Torvalds <torvalds@linux-foundation.org>
CommitDate: Sun May 18 13:28:49 2008 -0700

    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>
---
 arch/m68k/kernel/head.S |    2 +-
 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.
 	 */
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
m68k: Correct jump if not running on HP300, Linux Kernel Mailing List..., (Sun May 18, 6:01 pm)