From patchwork Thu Dec 9 11:59:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot for Dave Martin X-Patchwork-Id: 394102 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oB9C0KaU017783 for ; Thu, 9 Dec 2010 12:00:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754695Ab0LIMAT (ORCPT ); Thu, 9 Dec 2010 07:00:19 -0500 Received: from mail-wy0-f174.google.com ([74.125.82.174]:34140 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754530Ab0LIMAS (ORCPT ); Thu, 9 Dec 2010 07:00:18 -0500 Received: by wyb28 with SMTP id 28so2190121wyb.19 for ; Thu, 09 Dec 2010 04:00:17 -0800 (PST) Received: by 10.227.133.10 with SMTP id d10mr10296127wbt.94.1291896016989; Thu, 09 Dec 2010 04:00:16 -0800 (PST) Received: from e200948.cambridge.arm.com (host86-145-119-1.range86-145.btcentralplus.com [86.145.119.1]) by mx.google.com with ESMTPS id f35sm1172344wbf.8.2010.12.09.04.00.14 (version=SSLv3 cipher=RC4-MD5); Thu, 09 Dec 2010 04:00:15 -0800 (PST) From: Dave Martin To: linux-arm-kernel@lists.infradead.org Cc: Dave Martin , Santosh Shilimkar , linux-omap@vger.kernel.org Subject: [PATCH 2/2] ARM: Make CONFIG_FPE_NWFPE depend on !CONFIG_THUMB2_KERNEL Date: Thu, 9 Dec 2010 11:59:42 +0000 Message-Id: <1291895982-4775-3-git-send-email-dave.martin@linaro.org> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1291895982-4775-1-git-send-email-dave.martin@linaro.org> References: <1291895982-4775-1-git-send-email-dave.martin@linaro.org> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Thu, 09 Dec 2010 12:00:20 +0000 (UTC) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f9ca7f3..7e825c3 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1759,7 +1759,7 @@ comment "At least one emulation must be selected" config FPE_NWFPE bool "NWFPE math emulation" - depends on !AEABI || OABI_COMPAT + depends on (!AEABI || OABI_COMPAT) && !THUMB2_KERNEL ---help--- Say Y to include the NWFPE floating point emulator in the kernel. This is necessary to run most binaries. Linux does not currently