From patchwork Wed Nov 13 06:57:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: vkamensky X-Patchwork-Id: 21473 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f197.google.com (mail-ie0-f197.google.com [209.85.223.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8DA4823FBD for ; Wed, 13 Nov 2013 06:58:20 +0000 (UTC) Received: by mail-ie0-f197.google.com with SMTP id qd12sf4852413ieb.8 for ; Tue, 12 Nov 2013 22:58:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=mj7JQdfE5QnwdENK6aJtZYJMsQcG6Htmm6/8/l1K9O4=; b=fkLGgAEhedhf2b5eBSVZSjgOLrlP4v9Sx++pVJeOcr/UctocrC9N8ZMxI5sIsT3BzX QmVNo5aTX2oGZR3XFQnUjq+ssoIKxMl7HazHQEbHSshA3TKtK4vgEIQfwDzUXPvWYmvP EEXddxNZQPH7EuloPmDSN2SQVADZ4QtaQBZ75P8MxjkA8yV42aqfcS8r+PmMS35fn8Gu FWJfqd3tpy7pTFWKJzHTsn2MTU3KNaQQ9e6gfYqUDukPommFHIWqJkuJM6P2JtXFyFa8 cXGeG7qoaerE21ryEwyH044FaqxBCeGLvmCfda8lMfq2FUAa3hRSqLirPtYyiTlVqVZM NI4A== X-Gm-Message-State: ALoCoQlPjZhRCy8p2YOHDrChU5ka0vInYfyKlFOTHEz4JTKSobbOhW79DeYzUNsK6A6KndvuqFAi X-Received: by 10.50.164.198 with SMTP id ys6mr9056248igb.5.1384325900254; Tue, 12 Nov 2013 22:58:20 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.74.198 with SMTP id w6ls426675qev.9.gmail; Tue, 12 Nov 2013 22:58:20 -0800 (PST) X-Received: by 10.221.51.206 with SMTP id vj14mr33013818vcb.17.1384325900135; Tue, 12 Nov 2013 22:58:20 -0800 (PST) Received: from mail-vb0-f51.google.com (mail-vb0-f51.google.com [209.85.212.51]) by mx.google.com with ESMTPS id bq2si13907604vcb.115.2013.11.12.22.58.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 12 Nov 2013 22:58:20 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.51 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.51; Received: by mail-vb0-f51.google.com with SMTP id w5so5018444vbf.24 for ; Tue, 12 Nov 2013 22:58:20 -0800 (PST) X-Received: by 10.221.40.10 with SMTP id to10mr12120677vcb.22.1384325900016; Tue, 12 Nov 2013 22:58:20 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp217105vcz; Tue, 12 Nov 2013 22:58:19 -0800 (PST) X-Received: by 10.66.150.41 with SMTP id uf9mr40769627pab.108.1384325898781; Tue, 12 Nov 2013 22:58:18 -0800 (PST) Received: from mail-pa0-f43.google.com (mail-pa0-f43.google.com [209.85.220.43]) by mx.google.com with ESMTPS id sw1si2893576pbc.162.2013.11.12.22.58.18 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 12 Nov 2013 22:58:18 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.43 is neither permitted nor denied by best guess record for domain of victor.kamensky@linaro.org) client-ip=209.85.220.43; Received: by mail-pa0-f43.google.com with SMTP id fa1so4372315pad.2 for ; Tue, 12 Nov 2013 22:58:18 -0800 (PST) X-Received: by 10.66.12.103 with SMTP id x7mr41111715pab.54.1384325898225; Tue, 12 Nov 2013 22:58:18 -0800 (PST) Received: from kamensky-w530.cisco.com.net (c-24-6-79-41.hsd1.ca.comcast.net. [24.6.79.41]) by mx.google.com with ESMTPSA id y9sm19538006pas.10.2013.11.12.22.58.16 for (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128/128); Tue, 12 Nov 2013 22:58:17 -0800 (PST) From: Victor Kamensky To: linux-arm-kernel@lists.infradead.org, Dave.Martin@arm.com, ben.dooks@codethink.co.uk, u.kleine-koenig@pengutronix.de Cc: rmk@arm.linux.org.uk, nicolas.pitre@linaro.org, will.deacon@arm.com, taras.kondratiuk@linaro.org, patches@linaro.org, linaro-kernel@lists.linaro.org, Victor Kamensky Subject: [PATCH v2] ARM: signal: fix armv7-m build issue in sigreturn_codes.S Date: Tue, 12 Nov 2013 22:57:47 -0800 Message-Id: <1384325867-5140-2-git-send-email-victor.kamensky@linaro.org> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1384325867-5140-1-git-send-email-victor.kamensky@linaro.org> References: <1384325867-5140-1-git-send-email-victor.kamensky@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: victor.kamensky@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.51 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , In case of armv7-m architecture arm instructions are not allowed. For this architecture CONFIG_CPU_THUMBONLY is set. Let's explicitly set minimal architecture that allows both required thumb and arm opcodes. It is OK to do, since file as used as array of code snippets, which is indexed by signal.c code. Suggested-by: Dave Martin Signed-off-by: Victor Kamensky --- arch/arm/kernel/sigreturn_codes.S | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/kernel/sigreturn_codes.S b/arch/arm/kernel/sigreturn_codes.S index 3c5d0f2..081a041 100644 --- a/arch/arm/kernel/sigreturn_codes.S +++ b/arch/arm/kernel/sigreturn_codes.S @@ -30,12 +30,12 @@ * snippets. */ -#if __LINUX_ARM_ARCH__ <= 4 +#if (__LINUX_ARM_ARCH__ <= 4) || defined(CONFIG_CPU_THUMBONLY) /* * Note we manually set minimally required arch that supports - * required thumb opcodes for early arch versions. It is OK - * for this file to be used in combination with other - * lower arch variants, since these code snippets are only + * required thumb and arm opcodes for early arch versions or + * thumb only CPU. It is OK for this file to be used in combination + * with other arch variants, since these code snippets are only * used as input data. */ .arch armv4t