From patchwork Wed Jun 17 04:48:20 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 30787 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n5H4ss6p023290 for ; Wed, 17 Jun 2009 04:54:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750805AbZFQEyt (ORCPT ); Wed, 17 Jun 2009 00:54:49 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751253AbZFQEyt (ORCPT ); Wed, 17 Jun 2009 00:54:49 -0400 Received: from mail-pz0-f187.google.com ([209.85.222.187]:59307 "EHLO mail-pz0-f187.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750805AbZFQEys (ORCPT ); Wed, 17 Jun 2009 00:54:48 -0400 Received: by pzk17 with SMTP id 17so123810pzk.33 for ; Tue, 16 Jun 2009 21:54:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:date:message-id :subject; bh=YJCplUHGrVRUlPrZrIbFEqQSLrxdLX5VdnGk1xyS1Eo=; b=KWCEyZL2se6Wyvxw7BjSdg57KZThcNHqWrgCbKGhTKP+8LPE+dNtRQfn8Q7YyEZ1G9 WY2rznVCfyR5xAHiUe7P0SjFDtqziAiV68MBNRCWacAuZZvsmSWh3bdo89w9NM/kKK+S ltDHLjRYIPe0sPeGEMM574AD4EfR49ecvvyBI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:date:message-id:subject; b=wKXT8yW0Wxu+jGMZkYidA2DAblNFOLzlOZQOyx71UIzKKJ1S6s19+R36ud2rTCYJVr uA211Tr+ghIxPRho86EnLfHrXRe9IVjuCZzxjl+1sH96Gi+iYPMxkJSs3J7ZB/7CVCjJ MuOg+T3b1FSb/iur3Q0+46caOeTbGjoQHSX9k= Received: by 10.114.190.6 with SMTP id n6mr14792245waf.133.1245214308012; Tue, 16 Jun 2009 21:51:48 -0700 (PDT) Received: from rx1.opensource.se (210.5.32.202.bf.2iij.net [202.32.5.210]) by mx.google.com with ESMTPS id m6sm214063wag.49.2009.06.16.21.51.46 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 16 Jun 2009 21:51:47 -0700 (PDT) From: Magnus Damm To: linux-sh@vger.kernel.org Cc: Magnus Damm , lethal@linux-sh.org Date: Wed, 17 Jun 2009 13:48:20 +0900 Message-Id: <20090617044820.15262.37086.sendpatchset@rx1.opensource.se> Subject: [PATCH] sh: unbreak WARN_ON() Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org From: Magnus Damm Fix WARN_ON() by modifying the bug trap handling code to always return in the in-kernel instruction pointer case. Signed-off-by: Magnus Damm --- arch/sh/kernel/traps.c | 1 + 1 file changed, 1 insertion(+) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 0001/arch/sh/kernel/traps.c +++ work/arch/sh/kernel/traps.c 2009-06-16 14:29:42.000000000 +0900 @@ -69,6 +69,7 @@ BUILD_TRAP_HANDLER(bug) insn_size_t insn = *(insn_size_t *)instruction_pointer(regs); if (insn == TRAPA_BUG_OPCODE) handle_BUG(regs); + return; } #endif