From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762141AbYDXSf4 (ORCPT ); Thu, 24 Apr 2008 14:35:56 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755962AbYDXSeV (ORCPT ); Thu, 24 Apr 2008 14:34:21 -0400 Received: from harold.telenet-ops.be ([195.130.133.65]:54909 "EHLO harold.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753939AbYDXSeO (ORCPT ); Thu, 24 Apr 2008 14:34:14 -0400 Message-Id: <20080424183242.220179679@mail.of.borg> References: <20080424182940.424312704@mail.of.borg> User-Agent: quilt/0.46-1 Date: Thu, 24 Apr 2008 20:29:47 +0200 From: Geert Uytterhoeven To: Linus Torvalds , Andrew Morton Cc: linux-m68k@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [patch 07/15] m68k: Correct jump if not running on HP300 Content-Disposition: inline; filename=m68k-hp300-breaks-multi-platform.diff Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Geert Uytterhoeven 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 --- arch/m68k/kernel/head.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- 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. */ -- Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds