From patchwork Mon Dec 6 17:35:36 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: 379292 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 oB6Hb0lP005417 for ; Mon, 6 Dec 2010 17:37:03 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754044Ab0LFRg4 (ORCPT ); Mon, 6 Dec 2010 12:36:56 -0500 Received: from mail-wy0-f174.google.com ([74.125.82.174]:44264 "EHLO mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753211Ab0LFRgX (ORCPT ); Mon, 6 Dec 2010 12:36:23 -0500 Received: by mail-wy0-f174.google.com with SMTP id 28so12260626wyb.19 for ; Mon, 06 Dec 2010 09:36:23 -0800 (PST) Received: by 10.227.10.198 with SMTP id q6mr6047538wbq.21.1291656983209; Mon, 06 Dec 2010 09:36:23 -0800 (PST) Received: from e200948.cambridge.arm.com (host86-166-237-243.range86-166.btcentralplus.com [86.166.237.243]) by mx.google.com with ESMTPS id f35sm3600235wbf.14.2010.12.06.09.36.21 (version=SSLv3 cipher=RC4-MD5); Mon, 06 Dec 2010 09:36:22 -0800 (PST) From: Dave Martin To: linux-arm-kernel@lists.infradead.org Cc: Dave Martin , linux-omap@vger.kernel.org, linaro-dev@lists.linaro.org, Tony Lindgren Subject: [PATCH v2 2/3] ARM: omap4: Correct definition of do_wfi() for CONFIG_THUMB2_KERNEL Date: Mon, 6 Dec 2010 17:35:36 +0000 Message-Id: <1291656937-24992-3-git-send-email-dave.martin@linaro.org> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1291656937-24992-1-git-send-email-dave.martin@linaro.org> References: <1291656937-24992-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]); Mon, 06 Dec 2010 17:37:03 +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 2744dfe..c6b1320 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;