From patchwork Wed Aug 22 14:29:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 1361491 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 35E8B3FD40 for ; Wed, 22 Aug 2012 14:34:16 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T4Bwa-0003Ph-Sz; Wed, 22 Aug 2012 14:30:04 +0000 Received: from moutng.kundenserver.de ([212.227.126.186]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T4BwS-0003PD-NN for linux-arm-kernel@lists.infradead.org; Wed, 22 Aug 2012 14:30:01 +0000 Received: from localhost.localdomain (HSI-KBW-149-172-5-253.hsi13.kabel-badenwuerttemberg.de [149.172.5.253]) by mrelayeu.kundenserver.de (node=mreu4) with ESMTP (Nemesis) id 0M4gBt-1TrlIU0L6L-00yyzO; Wed, 22 Aug 2012 16:29:55 +0200 From: Arnd Bergmann To: Russell King Subject: [PATCH 2/4] ARM: allow PID_IN_CONTEXTIDR only for ARMv7 Date: Wed, 22 Aug 2012 16:29:38 +0200 Message-Id: <1345645780-2749-3-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1345645780-2749-1-git-send-email-arnd@arndb.de> References: <1345645780-2749-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:39epySVFofFwEtk6U40Voqvt3hnhyvYchW/XWNhCCAJ Zl/1jPEETAxb1Sad7ZWmnX6Tpx5ugtDXGKz0hQDsebMblTmyDd kelB2ElpcCtZga+ezHp7xmDVPwtu1kI/q+5OmEA9TcXNI9c2Ae qiKpABXyOh/YZFp9c9OQowD8QxSNgbP3urzLl7924cFCvPqvES NLwKreao/RlyhXdGwfVQBVuLFXcO0xqLeH75Pe/Zcb5Vv5MtDF vKkCcQMaUhray8T56aVKqbEKlrKu8/1B6euHP+FvKVuEKu7Bq1 PnlbM3BznKVhfwrmPL0z556mbbTp7bIXQP0G9fXeFqtsVTGD/L 5hp1hgBXt4K97NURsNW+/cV5AZFmRJcjat/1P6nXqk18G08PK6 hlaULMVZDv9iw== X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.126.186 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Will Deacon , Arnd Bergmann , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org When ARMv6 is enabled, we build the kernel with -march=armv6 or -march=armv6k, which means the bfi instruction is not available. Instead, it only works with -march=armv6t2 or -march=armv7-a. Without this patch, building rand-enIHAOL results in: /tmp/ccwCsCXC.s: Assembler messages: /tmp/ccwCsCXC.s:49: Error: selected processor does not support ARM mode `bfi r3,r2,#0,#8' Signed-off-by: Arnd Bergmann Cc: Will Deacon Cc: Russell King --- arch/arm/Kconfig.debug | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index f15f82b..11b9ff4 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -398,6 +398,7 @@ config ARM_KPROBES_TEST config PID_IN_CONTEXTIDR bool "Write the current PID to the CONTEXTIDR register" depends on CPU_COPY_V6 + depends on CPU_V7 && !CPU_V6 help Enabling this option causes the kernel to write the current PID to the PROCID field of the CONTEXTIDR register, at the expense of some