From patchwork Wed Feb 9 15:01:19 2011 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: 544311 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 p19F1em2030066 for ; Wed, 9 Feb 2011 15:02:51 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756024Ab1BIPBs (ORCPT ); Wed, 9 Feb 2011 10:01:48 -0500 Received: from mail-wy0-f174.google.com ([74.125.82.174]:50678 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755793Ab1BIPBr (ORCPT ); Wed, 9 Feb 2011 10:01:47 -0500 Received: by wyb28 with SMTP id 28so265094wyb.19 for ; Wed, 09 Feb 2011 07:01:45 -0800 (PST) Received: by 10.227.154.83 with SMTP id n19mr2844315wbw.203.1297263705268; Wed, 09 Feb 2011 07:01:45 -0800 (PST) Received: from e200948.cambridge.arm.com (host86-160-160-87.range86-160.btcentralplus.com [86.160.160.87]) by mx.google.com with ESMTPS id w25sm356204wbd.5.2011.02.09.07.01.43 (version=SSLv3 cipher=RC4-MD5); Wed, 09 Feb 2011 07:01:44 -0800 (PST) From: Dave Martin To: linux-arm-kernel@lists.infradead.org Cc: Dave Martin , Tony Lindgren , Santosh Shilimkar , Jean Pihet , linux-omap@vger.kernel.org, Nicolas Pitre Subject: [PATCH v4 1/5] ARM: omap4: Provide do_wfi() for Thumb-2 Date: Wed, 9 Feb 2011 15:01:19 +0000 Message-Id: <1297263683-10621-2-git-send-email-dave.martin@linaro.org> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1297263683-10621-1-git-send-email-dave.martin@linaro.org> References: <1297263683-10621-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.6 (demeter1.kernel.org [140.211.167.41]); Wed, 09 Feb 2011 15:03:31 +0000 (UTC) diff --git a/arch/arm/mach-omap2/include/mach/omap4-common.h b/arch/arm/mach-omap2/include/mach/omap4-common.h index 5b0270b..de441c0 100644 --- a/arch/arm/mach-omap2/include/mach/omap4-common.h +++ b/arch/arm/mach-omap2/include/mach/omap4-common.h @@ -17,8 +17,12 @@ * wfi used in low power code. Directly opcode is used instead * of instruction to avoid mulit-omap build break */ +#ifdef CONFIG_THUMB2_KERNEL +#define do_wfi() __asm__ __volatile__ ("wfi" : : : "memory") +#else #define do_wfi() \ __asm__ __volatile__ (".word 0xe320f003" : : : "memory") +#endif #ifdef CONFIG_CACHE_L2X0 extern void __iomem *l2cache_base;