From patchwork Mon Jan 12 04:25:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring (Arm)" X-Patchwork-Id: 5607751 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E66A39F358 for ; Mon, 12 Jan 2015 04:28:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 203052037D for ; Mon, 12 Jan 2015 04:28:47 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5D05320353 for ; Mon, 12 Jan 2015 04:28:46 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YAWaI-0002Od-Oa; Mon, 12 Jan 2015 04:26:34 +0000 Received: from mail-ob0-x233.google.com ([2607:f8b0:4003:c01::233]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YAWaF-0002N1-JD for linux-arm-kernel@lists.infradead.org; Mon, 12 Jan 2015 04:26:32 +0000 Received: by mail-ob0-f179.google.com with SMTP id va2so20640420obc.10 for ; Sun, 11 Jan 2015 20:26:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=OvRYLl6XiXklzVcnQN1rNNfhMl+JHt1pJyWrII2uOGQ=; b=Ry3OJfGZo6B8Qw+EvNUDZLiza+JqG8ZMy7v/+yPKcwsxnhixo1ofpg1YWr3rUUrQaV Kyvq4ycfOiw5oMg71Obaukgd/yN9m2Q1ropmdJjMEWY8TEnfc8LYNgYrzdGDiiiQxEXX bUSbHiujKGljXiAcEcqnbffRv/opmqkKArmAVLgnCCe5R16dsePrshcTBzJoe32qVAFM 7fyUfSqwLfOTKRxbPtsbWgyPW0pP/IdGvpDx6ynsHcgYE2yWiiw//EOa99yTsogtsSrT ySUw8y+Gl4IpvQCRrKQf7CaGowAOU5NAtzsGYkkdEI59ThWV3Xq+w3A9jOyShknRyaCn El5A== X-Received: by 10.202.97.9 with SMTP id v9mr15364619oib.34.1421036767926; Sun, 11 Jan 2015 20:26:07 -0800 (PST) Received: from rob-laptop.herring.priv (72-48-98-129.dyn.grandenetworks.net. [72.48.98.129]) by mx.google.com with ESMTPSA id uv10sm8549990obc.27.2015.01.11.20.26.06 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 11 Jan 2015 20:26:06 -0800 (PST) From: Rob Herring To: linux-arm-kernel@lists.infradead.org, Russell King Subject: [PATCH] ARM: fix v7M build for !CONFIG_PRINTK Date: Sun, 11 Jan 2015 22:25:49 -0600 Message-Id: <1421036749-5308-1-git-send-email-robh@kernel.org> X-Mailer: git-send-email 2.1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150111_202631_748154_D12DDD22 X-CRM114-Status: UNSURE ( 7.97 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.4 (/) Cc: Rob Herring X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Minimal builds for v7M are broken when printk is disabled. The caller is assembly so add the necessary ifdef around the call. Signed-off-by: Rob Herring --- arch/arm/kernel/entry-v7m.S | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/kernel/entry-v7m.S b/arch/arm/kernel/entry-v7m.S index 2260f18..8944f49 100644 --- a/arch/arm/kernel/entry-v7m.S +++ b/arch/arm/kernel/entry-v7m.S @@ -22,10 +22,12 @@ __invalid_entry: v7m_exception_entry +#ifdef CONFIG_PRINTK adr r0, strerr mrs r1, ipsr mov r2, lr bl printk +#endif mov r0, sp bl show_regs 1: b 1b