From patchwork Thu Feb 3 18:02:37 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: 530221 X-Patchwork-Delegate: khilman@deeprootsystems.com 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 p13I3Qfu019775 for ; Thu, 3 Feb 2011 18:03:26 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756645Ab1BCSDW (ORCPT ); Thu, 3 Feb 2011 13:03:22 -0500 Received: from mail-ww0-f44.google.com ([74.125.82.44]:49592 "EHLO mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756502Ab1BCSDW (ORCPT ); Thu, 3 Feb 2011 13:03:22 -0500 Received: by mail-ww0-f44.google.com with SMTP id 36so1470092wwa.1 for ; Thu, 03 Feb 2011 10:03:21 -0800 (PST) Received: by 10.227.136.9 with SMTP id p9mr9076891wbt.30.1296756200716; Thu, 03 Feb 2011 10:03:20 -0800 (PST) Received: from e200948.cambridge.arm.com (host86-160-160-30.range86-160.btcentralplus.com [86.160.160.30]) by mx.google.com with ESMTPS id x1sm307153wbh.14.2011.02.03.10.03.18 (version=SSLv3 cipher=RC4-MD5); Thu, 03 Feb 2011 10:03:20 -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 v2 1/5] ARM: omap4: Correct definition of do_wfi() for CONFIG_THUMB2_KERNEL Date: Thu, 3 Feb 2011 18:02:37 +0000 Message-Id: <1296756161-26092-2-git-send-email-dave.martin@linaro.org> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1296756161-26092-1-git-send-email-dave.martin@linaro.org> References: <1296756161-26092-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]); Thu, 03 Feb 2011 18:03:26 +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..68ce058 100644 --- a/arch/arm/mach-omap2/include/mach/omap4-common.h +++ b/arch/arm/mach-omap2/include/mach/omap4-common.h @@ -17,8 +17,13 @@ * 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;