From patchwork Sat Jan 21 03:20:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Pitre X-Patchwork-Id: 137141 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 66E6FB6F7E for ; Sat, 21 Jan 2012 14:24:14 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1RoRVk-00062A-VQ; Sat, 21 Jan 2012 03:21:01 +0000 Received: from relais.videotron.ca ([24.201.245.36]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1RoRVg-00061w-Kl for linux-arm-kernel@lists.infradead.org; Sat, 21 Jan 2012 03:20:57 +0000 MIME-version: 1.0 Received: from xanadu.home ([66.130.28.92]) by VL-VM-MR001.ip.videotron.ca (Oracle Communications Messaging Exchange Server 7u4-22.01 64bit (built Apr 21 2011)) with ESMTP id <0LY400CF1P8H3S00@VL-VM-MR001.ip.videotron.ca> for linux-arm-kernel@lists.infradead.org; Fri, 20 Jan 2012 22:19:30 -0500 (EST) Date: Fri, 20 Jan 2012 22:20:55 -0500 (EST) From: Nicolas Pitre To: Russell King - ARM Linux Subject: Re: [PATCH 00/20] arch_idle() cleanup and mach/system.h removal In-reply-to: <20120113140723.GW1068@n2100.arm.linux.org.uk> Message-id: References: <1324288069-21940-1-git-send-email-nico@fluxnic.net> <20120113104358.GR1068@n2100.arm.linux.org.uk> <20120113140723.GW1068@n2100.arm.linux.org.uk> User-Agent: Alpine 2.02 (LFD 1266 2009-07-14) 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 [24.201.245.36 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org On Fri, 13 Jan 2012, Russell King - ARM Linux wrote: > On Fri, Jan 13, 2012 at 08:54:58AM -0500, Nicolas Pitre wrote: > > On Fri, 13 Jan 2012, Russell King - ARM Linux wrote: > > > > > So, sending a pull request for the idle stuff in the last two days of > > > the merge window, for a change which is quite big, which conflicts, > > > which wasn't in -next before the merge window is just asking for trouble, > > > and I'm not going to do it. > > > > Too bad. Let's try to stage this early in your devel-stable branch for > > next cycle then. > > Arnd and myself just agreed this; once rc1 is out, could you please rebase > on that, resend the pull request, and we'll merge it into both trees. > Here it is. The following changes since commit dcd6c92267155e70a94b3927bce681ce74b80d1f: Linux 3.3-rc1 (2012-01-19 15:04:48 -0800) are available in the git repository at: git://git.linaro.org/people/nico/linux idle for you to fetch changes up to a570067df9cc1b1821ca5255bbbe8adb67aca199: ARM: big removal of now unused arch_idle() (2012-01-20 19:25:58 -0500) ---------------------------------------------------------------- Nicolas Pitre (23): ARM: OMAP1: Fix pm_idle during suspend ARM: clean up idle handlers ARM: OMAP: convert idle handlers from pm_idle to arm_pm_idle ARM: mach-s5pv210: use standard arch_idle() ARM: mach-s5pc100: use standard arch_idle() ARM: mach-s5p64x0: move idle handler from pm_idle to arm_pm_idle ARM: mach-exynos: use standard arch_idle() ARM: mach-at91: move special idle code out of line ARM: mach-clps711x: move special idle code out of line ARM: mach-ebsa110: move special idle code out of line ARM: mach-gemini: move special idle code out of line ARM: mach-h720x: move special idle code out of line ARM: s3c24xx: move special idle code to out of line ARM: plat-mxc: hook special idle handlers to arm_pm_idle ARM: mach-msm: hook special idle handlers to arm_pm_idle ARM: mach-ixp23xx: properly disable CPU idle call ARM: mach-ixp4xx: properly disable CPU idle call ARM: mach-shark: properly disable CPU idle call ARM: mach-w90x900: properly disable CPU idle call ARM: mach-s3c64xx: use standard arch_idle() implementation ARM: mach-tegra: properly disable CPU idle call ARM: substitute arch_idle() ARM: big removal of now unused arch_idle() arch/arm/include/asm/system.h | 1 + arch/arm/kernel/process.c | 27 +++++++----- arch/arm/mach-at91/at91cap9.c | 8 ++++ arch/arm/mach-at91/at91rm9200.c | 10 ++++ arch/arm/mach-at91/at91sam9260.c | 8 ++++ arch/arm/mach-at91/at91sam9261.c | 8 ++++ arch/arm/mach-at91/at91sam9263.c | 8 ++++ arch/arm/mach-at91/at91sam9g45.c | 7 +++ arch/arm/mach-at91/at91sam9rl.c | 8 ++++ arch/arm/mach-at91/at91x40.c | 12 +++++ arch/arm/mach-at91/include/mach/system.h | 50 ---------------------- arch/arm/mach-bcmring/include/mach/system.h | 28 ------------ arch/arm/mach-clps711x/common.c | 16 +++++++ arch/arm/mach-clps711x/include/mach/system.h | 35 --------------- arch/arm/mach-cns3xxx/include/mach/system.h | 25 ----------- arch/arm/mach-davinci/include/mach/system.h | 21 --------- arch/arm/mach-dove/include/mach/system.h | 17 ------- arch/arm/mach-ebsa110/core.c | 25 +++++++++++ arch/arm/mach-ebsa110/include/mach/system.h | 37 ---------------- arch/arm/mach-ep93xx/include/mach/system.h | 7 --- arch/arm/mach-exynos/common.c | 12 ----- arch/arm/mach-exynos/include/mach/system.h | 20 --------- arch/arm/mach-footbridge/include/mach/system.h | 13 ------ arch/arm/mach-gemini/Makefile | 2 +- arch/arm/mach-gemini/idle.c | 29 +++++++++++++ arch/arm/mach-gemini/include/mach/system.h | 14 ------ arch/arm/mach-gemini/irq.c | 4 +- arch/arm/mach-h720x/common.c | 18 ++++++++ arch/arm/mach-h720x/include/mach/system.h | 27 ------------ arch/arm/mach-highbank/include/mach/system.h | 24 ---------- arch/arm/mach-imx/mm-imx3.c | 52 +++++++++++------------ arch/arm/mach-imx/pm-imx27.c | 3 +- arch/arm/mach-integrator/include/mach/system.h | 33 -------------- arch/arm/mach-iop13xx/include/mach/system.h | 13 ------ arch/arm/mach-iop32x/include/mach/system.h | 13 ------ arch/arm/mach-iop33x/include/mach/system.h | 13 ------ arch/arm/mach-ixp2000/include/mach/system.h | 14 ------ arch/arm/mach-ixp23xx/core.c | 3 + arch/arm/mach-ixp23xx/include/mach/system.h | 16 ------- arch/arm/mach-ixp4xx/common.c | 6 +++ arch/arm/mach-ixp4xx/include/mach/system.h | 19 -------- arch/arm/mach-kirkwood/include/mach/system.h | 17 ------- arch/arm/mach-ks8695/include/mach/system.h | 27 ------------ arch/arm/mach-lpc32xx/include/mach/system.h | 27 ------------ arch/arm/mach-mmp/include/mach/system.h | 16 ------- arch/arm/mach-msm/idle.S | 36 ---------------- arch/arm/mach-msm/idle.c | 49 +++++++++++++++++++++ arch/arm/mach-msm/include/mach/system.h | 1 - arch/arm/mach-mv78xx0/include/mach/system.h | 17 ------- arch/arm/mach-mx5/mm.c | 28 +++++------- arch/arm/mach-mxs/include/mach/system.h | 25 ----------- arch/arm/mach-mxs/pm.c | 3 +- arch/arm/mach-netx/include/mach/system.h | 28 ------------ arch/arm/mach-nomadik/include/mach/system.h | 32 -------------- arch/arm/mach-omap1/include/mach/system.h | 5 -- arch/arm/mach-omap1/pm.c | 19 ++------- arch/arm/mach-omap2/include/mach/system.h | 5 -- arch/arm/mach-omap2/pm24xx.c | 4 +- arch/arm/mach-omap2/pm34xx.c | 6 +-- arch/arm/mach-omap2/pm44xx.c | 8 +-- arch/arm/mach-omap2/prm_common.c | 1 - arch/arm/mach-orion5x/include/mach/system.h | 19 -------- arch/arm/mach-picoxcell/include/mach/system.h | 26 ----------- arch/arm/mach-pnx4008/include/mach/system.h | 29 ------------- arch/arm/mach-prima2/include/mach/system.h | 17 ------- arch/arm/mach-pxa/include/mach/system.h | 15 ------- arch/arm/mach-realview/include/mach/system.h | 33 -------------- arch/arm/mach-rpc/include/mach/system.h | 13 ------ arch/arm/mach-s3c2410/include/mach/system.h | 54 ------------------------ arch/arm/mach-s3c2412/s3c2412.c | 4 +- arch/arm/mach-s3c2416/s3c2416.c | 3 - arch/arm/mach-s3c64xx/include/mach/system.h | 19 -------- arch/arm/mach-s5p64x0/common.c | 15 +++---- arch/arm/mach-s5p64x0/include/mach/system.h | 21 --------- arch/arm/mach-s5pc100/common.c | 12 ----- arch/arm/mach-s5pc100/include/mach/system.h | 19 -------- arch/arm/mach-s5pv210/common.c | 12 ----- arch/arm/mach-s5pv210/include/mach/system.h | 21 --------- arch/arm/mach-sa1100/include/mach/system.h | 9 ---- arch/arm/mach-shark/core.c | 6 +++ arch/arm/mach-shark/include/mach/system.h | 13 ------ arch/arm/mach-shmobile/include/mach/system.h | 5 -- arch/arm/mach-spear3xx/include/mach/system.h | 19 -------- arch/arm/mach-spear6xx/include/mach/system.h | 19 -------- arch/arm/mach-tegra/common.c | 3 +- arch/arm/mach-tegra/include/mach/system.h | 28 ------------ arch/arm/mach-u300/include/mach/system.h | 14 ------ arch/arm/mach-ux500/include/mach/system.h | 20 --------- arch/arm/mach-versatile/include/mach/system.h | 33 -------------- arch/arm/mach-vexpress/include/mach/system.h | 33 -------------- arch/arm/mach-vt8500/include/mach/system.h | 5 -- arch/arm/mach-w90x900/dev.c | 1 + arch/arm/mach-w90x900/include/mach/system.h | 19 -------- arch/arm/mach-zynq/include/mach/system.h | 23 ---------- arch/arm/plat-mxc/include/mach/system.h | 25 ----------- arch/arm/plat-omap/include/plat/system.h | 15 ------- arch/arm/plat-s3c24xx/cpu.c | 27 ++++++++++++ arch/arm/plat-spear/include/plat/system.h | 26 ----------- 98 files changed, 326 insertions(+), 1409 deletions(-) delete mode 100644 arch/arm/mach-at91/include/mach/system.h delete mode 100644 arch/arm/mach-bcmring/include/mach/system.h delete mode 100644 arch/arm/mach-clps711x/include/mach/system.h delete mode 100644 arch/arm/mach-cns3xxx/include/mach/system.h delete mode 100644 arch/arm/mach-davinci/include/mach/system.h delete mode 100644 arch/arm/mach-dove/include/mach/system.h delete mode 100644 arch/arm/mach-ebsa110/include/mach/system.h delete mode 100644 arch/arm/mach-ep93xx/include/mach/system.h delete mode 100644 arch/arm/mach-exynos/include/mach/system.h delete mode 100644 arch/arm/mach-footbridge/include/mach/system.h create mode 100644 arch/arm/mach-gemini/idle.c delete mode 100644 arch/arm/mach-h720x/include/mach/system.h delete mode 100644 arch/arm/mach-highbank/include/mach/system.h delete mode 100644 arch/arm/mach-integrator/include/mach/system.h delete mode 100644 arch/arm/mach-iop13xx/include/mach/system.h delete mode 100644 arch/arm/mach-iop32x/include/mach/system.h delete mode 100644 arch/arm/mach-iop33x/include/mach/system.h delete mode 100644 arch/arm/mach-ixp2000/include/mach/system.h delete mode 100644 arch/arm/mach-ixp23xx/include/mach/system.h delete mode 100644 arch/arm/mach-ixp4xx/include/mach/system.h delete mode 100644 arch/arm/mach-kirkwood/include/mach/system.h delete mode 100644 arch/arm/mach-ks8695/include/mach/system.h delete mode 100644 arch/arm/mach-lpc32xx/include/mach/system.h delete mode 100644 arch/arm/mach-mmp/include/mach/system.h delete mode 100644 arch/arm/mach-msm/idle.S create mode 100644 arch/arm/mach-msm/idle.c delete mode 100644 arch/arm/mach-mv78xx0/include/mach/system.h delete mode 100644 arch/arm/mach-mxs/include/mach/system.h delete mode 100644 arch/arm/mach-netx/include/mach/system.h delete mode 100644 arch/arm/mach-nomadik/include/mach/system.h delete mode 100644 arch/arm/mach-omap1/include/mach/system.h delete mode 100644 arch/arm/mach-omap2/include/mach/system.h delete mode 100644 arch/arm/mach-orion5x/include/mach/system.h delete mode 100644 arch/arm/mach-picoxcell/include/mach/system.h delete mode 100644 arch/arm/mach-pnx4008/include/mach/system.h delete mode 100644 arch/arm/mach-prima2/include/mach/system.h delete mode 100644 arch/arm/mach-pxa/include/mach/system.h delete mode 100644 arch/arm/mach-realview/include/mach/system.h delete mode 100644 arch/arm/mach-rpc/include/mach/system.h delete mode 100644 arch/arm/mach-s3c2410/include/mach/system.h delete mode 100644 arch/arm/mach-s3c64xx/include/mach/system.h delete mode 100644 arch/arm/mach-s5p64x0/include/mach/system.h delete mode 100644 arch/arm/mach-s5pc100/include/mach/system.h delete mode 100644 arch/arm/mach-s5pv210/include/mach/system.h delete mode 100644 arch/arm/mach-sa1100/include/mach/system.h delete mode 100644 arch/arm/mach-shark/include/mach/system.h delete mode 100644 arch/arm/mach-spear3xx/include/mach/system.h delete mode 100644 arch/arm/mach-spear6xx/include/mach/system.h delete mode 100644 arch/arm/mach-tegra/include/mach/system.h delete mode 100644 arch/arm/mach-u300/include/mach/system.h delete mode 100644 arch/arm/mach-ux500/include/mach/system.h delete mode 100644 arch/arm/mach-versatile/include/mach/system.h delete mode 100644 arch/arm/mach-vexpress/include/mach/system.h delete mode 100644 arch/arm/mach-w90x900/include/mach/system.h delete mode 100644 arch/arm/mach-zynq/include/mach/system.h delete mode 100644 arch/arm/plat-mxc/include/mach/system.h delete mode 100644 arch/arm/plat-omap/include/plat/system.h delete mode 100644 arch/arm/plat-spear/include/plat/system.h