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: Victor Kamensky X-Patchwork-Id: 3177101 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 045B99F3A0 for ; Wed, 13 Nov 2013 06:58:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 319D12057F for ; Wed, 13 Nov 2013 06:58:52 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2C303204B0 for ; Wed, 13 Nov 2013 06:58:51 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VgUPW-0004p2-94; Wed, 13 Nov 2013 06:58:46 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VgUPT-00062m-RN; Wed, 13 Nov 2013 06:58:43 +0000 Received: from mail-pb0-f48.google.com ([209.85.160.48]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VgUPQ-00062S-E7 for linux-arm-kernel@lists.infradead.org; Wed, 13 Nov 2013 06:58:41 +0000 Received: by mail-pb0-f48.google.com with SMTP id mc17so5796577pbc.35 for ; Tue, 12 Nov 2013 22:58:18 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mj7JQdfE5QnwdENK6aJtZYJMsQcG6Htmm6/8/l1K9O4=; b=IgjOV00t7eFUA6tGJImT30vhRAAGIab6Ym1kxTnoc1uCRVuNpHtgf4Aymb0C88OnTZ cxbRqbVHq8i3Q3uxd/MGvJCMNbjelUMHyv+nCpM7jkCDhWPJK+kmy3Nsssn6KDriMJuN IE5vOtsDPSS2iqeuFyylHcu3GCDM6UgFTe7+HptQS07CNqPjnGhEkHE8Fnp0fhjbPu5p qfvlu6eaTL+a2JoMbaX5XG85r5Pr9Vv9RwcPnIo0K4ulPWTHck3g0/7c1DoR75bFIqrJ qCA973IPg+FKtAlKIsl5OTBzFw5hKyP6hSbP+PkWFHmObjluo5pbLAvA1z62Jc4gqIfP B/0A== X-Gm-Message-State: ALoCoQmNFUaecv6hRhrZaWgffp6ZGEPuKvqYIMsVVNf7hMO+WA35fs68HhsMEO6GvsCcd1ww0jp7 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 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131113_015840_572597_AAB050E1 X-CRM114-Status: UNSURE ( 9.08 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) Cc: nicolas.pitre@linaro.org, linaro-kernel@lists.linaro.org, patches@linaro.org, taras.kondratiuk@linaro.org, Victor Kamensky , will.deacon@arm.com, rmk@arm.linux.org.uk X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 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.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 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