From: daniel.lezcano@linaro.org (Daniel Lezcano)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 07/21] ARM: tegra: unify tegra_idle_device definitions
Date: Tue, 23 Apr 2013 18:56:09 +0200 [thread overview]
Message-ID: <5176BD29.1000405@linaro.org> (raw)
In-Reply-To: <1366734653-488286-8-git-send-email-arnd@arndb.de>
On 04/23/2013 06:30 PM, Arnd Bergmann wrote:
> The three tegra variants (20, 30, 114) each define their own per-cpu
> variable for tegra_idle_device, which causes link errors when you
> build the kernel for more than one of them:
>
> cpuidle-tegra30.o:(.discard+0x0): multiple definition of `__pcpu_unique_tegra_idle_device'
> cpuidle-tegra20.o:(.discard+0x0): first defined here
> cpuidle-tegra114.o:(.discard+0x0): multiple definition of `__pcpu_unique_tegra_idle_device'
> cpuidle-tegra20.o:(.discard+0x0): first defined here
>
> By moving the variable into the common cpuidle.c file, we save a little
> bit of object code size and avoid that warning.
> As a bonus, this patch also removes the unused "drv" variables in each
> of the three files that caused a warning since 0697598db "ARM: tegra:
> cpuidle: remove useless initialization".
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Stephen Warren <swarren@nvidia.com>
> Cc: Joseph Lo <josephl@nvidia.com>
> Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
> Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> ---
Hi Arnd,
the patch sounds good but I think the side effect of the consolidation
patchset [1] fixed that.
You can find these fixes in Rafael's tree:
https://git.kernel.org/cgit/linux/kernel/git/rafael/linux-pm.git/commit/?h=linux-next&id=4c637b2175a0dc65d533494225525c6c82d73293
https://git.kernel.org/cgit/linux/kernel/git/rafael/linux-pm.git/commit/?h=linux-next&id=e158f9da6974cc11bfab2246a9b10021af0e0d8a
https://git.kernel.org/cgit/linux/kernel/git/rafael/linux-pm.git/commit/?h=linux-next&id=c5106c9dea9a6022ab84c6cb1d4a0b19fc5af0e2
https://git.kernel.org/cgit/linux/kernel/git/rafael/linux-pm.git/commit/?h=linux-next&id=f040c26ffaa5e56f2bca427c719c9601a02e70e5
[1] http://www.spinics.net/lists/arm-kernel/msg239811.html
> arch/arm/mach-tegra/cpuidle-tegra114.c | 5 ++---
> arch/arm/mach-tegra/cpuidle-tegra20.c | 4 +---
> arch/arm/mach-tegra/cpuidle-tegra30.c | 4 +---
> arch/arm/mach-tegra/cpuidle.c | 2 ++
> arch/arm/mach-tegra/cpuidle.h | 4 ++++
> 5 files changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/arch/arm/mach-tegra/cpuidle-tegra114.c b/arch/arm/mach-tegra/cpuidle-tegra114.c
> index 0f4e8c4..09067a1 100644
> --- a/arch/arm/mach-tegra/cpuidle-tegra114.c
> +++ b/arch/arm/mach-tegra/cpuidle-tegra114.c
> @@ -20,6 +20,8 @@
>
> #include <asm/cpuidle.h>
>
> +#include "cpuidle.h"
> +
> static struct cpuidle_driver tegra_idle_driver = {
> .name = "tegra_idle",
> .owner = THIS_MODULE,
> @@ -30,14 +32,11 @@ static struct cpuidle_driver tegra_idle_driver = {
> },
> };
>
> -static DEFINE_PER_CPU(struct cpuidle_device, tegra_idle_device);
> -
> int __init tegra114_cpuidle_init(void)
> {
> int ret;
> unsigned int cpu;
> struct cpuidle_device *dev;
> - struct cpuidle_driver *drv = &tegra_idle_driver;
>
> ret = cpuidle_register_driver(&tegra_idle_driver);
> if (ret) {
> diff --git a/arch/arm/mach-tegra/cpuidle-tegra20.c b/arch/arm/mach-tegra/cpuidle-tegra20.c
> index 825ced4..c811328 100644
> --- a/arch/arm/mach-tegra/cpuidle-tegra20.c
> +++ b/arch/arm/mach-tegra/cpuidle-tegra20.c
> @@ -36,6 +36,7 @@
> #include "iomap.h"
> #include "irq.h"
> #include "flowctrl.h"
> +#include "cpuidle.h"
>
> #ifdef CONFIG_PM_SLEEP
> static bool abort_flag;
> @@ -67,8 +68,6 @@ static struct cpuidle_driver tegra_idle_driver = {
> .en_core_tk_irqen = 1,
> };
>
> -static DEFINE_PER_CPU(struct cpuidle_device, tegra_idle_device);
> -
> #ifdef CONFIG_PM_SLEEP
> #ifdef CONFIG_SMP
> static void __iomem *pmc = IO_ADDRESS(TEGRA_PMC_BASE);
> @@ -220,7 +219,6 @@ int __init tegra20_cpuidle_init(void)
> int ret;
> unsigned int cpu;
> struct cpuidle_device *dev;
> - struct cpuidle_driver *drv = &tegra_idle_driver;
>
> #ifdef CONFIG_PM_SLEEP
> tegra_tear_down_cpu = tegra20_tear_down_cpu;
> diff --git a/arch/arm/mach-tegra/cpuidle-tegra30.c b/arch/arm/mach-tegra/cpuidle-tegra30.c
> index 8b50cf4..6187478 100644
> --- a/arch/arm/mach-tegra/cpuidle-tegra30.c
> +++ b/arch/arm/mach-tegra/cpuidle-tegra30.c
> @@ -33,6 +33,7 @@
>
> #include "pm.h"
> #include "sleep.h"
> +#include "cpuidle.h"
>
> #ifdef CONFIG_PM_SLEEP
> static int tegra30_idle_lp2(struct cpuidle_device *dev,
> @@ -65,8 +66,6 @@ static struct cpuidle_driver tegra_idle_driver = {
> },
> };
>
> -static DEFINE_PER_CPU(struct cpuidle_device, tegra_idle_device);
> -
> #ifdef CONFIG_PM_SLEEP
> static bool tegra30_cpu_cluster_power_down(struct cpuidle_device *dev,
> struct cpuidle_driver *drv,
> @@ -160,7 +159,6 @@ int __init tegra30_cpuidle_init(void)
> int ret;
> unsigned int cpu;
> struct cpuidle_device *dev;
> - struct cpuidle_driver *drv = &tegra_idle_driver;
>
> #ifdef CONFIG_PM_SLEEP
> tegra_tear_down_cpu = tegra30_tear_down_cpu;
> diff --git a/arch/arm/mach-tegra/cpuidle.c b/arch/arm/mach-tegra/cpuidle.c
> index 4b744c4..1bac560 100644
> --- a/arch/arm/mach-tegra/cpuidle.c
> +++ b/arch/arm/mach-tegra/cpuidle.c
> @@ -27,6 +27,8 @@
> #include "fuse.h"
> #include "cpuidle.h"
>
> +DEFINE_PER_CPU(struct cpuidle_device, tegra_idle_device);
> +
> static int __init tegra_cpuidle_init(void)
> {
> int ret;
> diff --git a/arch/arm/mach-tegra/cpuidle.h b/arch/arm/mach-tegra/cpuidle.h
> index d733f75..a4c5f17 100644
> --- a/arch/arm/mach-tegra/cpuidle.h
> +++ b/arch/arm/mach-tegra/cpuidle.h
> @@ -17,6 +17,10 @@
> #ifndef __MACH_TEGRA_CPUIDLE_H
> #define __MACH_TEGRA_CPUIDLE_H
>
> +#include <linux/cpuidle.h>
> +
> +DECLARE_PER_CPU(struct cpuidle_device, tegra_idle_device);
> +
> #ifdef CONFIG_ARCH_TEGRA_2x_SOC
> int tegra20_cpuidle_init(void);
> #else
>
--
<http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
next prev parent reply other threads:[~2013-04-23 16:56 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-23 16:30 [PATCH 00/21] ARM build fixes for 3.10 Arnd Bergmann
2013-04-23 16:30 ` [PATCH 01/21] Turn off -Wmaybe-uninitialized when building with -Os Arnd Bergmann
2013-04-23 16:30 ` [PATCH 02/21] ARM: compressed/head.S: work around new binutils warning Arnd Bergmann
2013-04-23 16:30 ` [PATCH 03/21] ARM: use optimized do_div only for EABI Arnd Bergmann
2013-04-23 16:30 ` [PATCH 04/21] ARM: kvm: define KVM_ARM_MAX_VCPUS unconditionally Arnd Bergmann
2013-04-23 17:29 ` Christoffer Dall
2013-04-23 17:32 ` Christoffer Dall
2013-04-23 16:30 ` [PATCH 05/21] ARM: OMAP2+: add dependencies on ARCH_MULTI_V6/V7 Arnd Bergmann
2013-04-23 18:01 ` Tony Lindgren
2013-04-23 19:31 ` Arnd Bergmann
2013-04-23 16:30 ` [PATCH 06/21] ARM: tegra: call cpu_do_idle from C code Arnd Bergmann
2013-04-24 2:55 ` Joseph Lo
2013-04-23 16:30 ` [PATCH 07/21] ARM: tegra: unify tegra_idle_device definitions Arnd Bergmann
2013-04-23 16:56 ` Daniel Lezcano [this message]
2013-04-23 18:57 ` Arnd Bergmann
2013-04-23 22:04 ` Daniel Lezcano
2013-04-24 2:56 ` Joseph Lo
2013-04-23 16:30 ` [PATCH 08/21] ASoC: ux500: forward declare msp_i2s_platform_data Arnd Bergmann
2013-04-23 18:25 ` Mark Brown
2013-04-23 16:30 ` [PATCH 09/21] spi/sirf: fix MODULE_DEVICE_TABLE Arnd Bergmann
2013-04-23 18:27 ` Mark Brown
2013-04-23 16:30 ` [PATCH 10/21] ssb: fix alignment of struct bcma_device_id Arnd Bergmann
2013-04-23 16:30 ` [PATCH 11/21] drm/tilcdc: use only a single module device table Arnd Bergmann
2013-04-25 17:39 ` Rob Clark
2013-04-23 16:30 ` [PATCH 12/21] mmc: sdhci-tegra: fix MODULE_DEVICE_TABLE Arnd Bergmann
2013-04-23 16:46 ` Chris Ball
2013-04-23 18:55 ` Arnd Bergmann
2013-04-23 19:07 ` Chris Ball
2013-04-23 16:30 ` [PATCH 13/21] misc: mark spear13xx-pcie-gadget as broken Arnd Bergmann
2013-04-24 3:20 ` Viresh Kumar
2013-04-23 16:30 ` [PATCH 14/21] staging: nvec: allow modular build Arnd Bergmann
2013-04-23 19:21 ` Marc Dietrich
2013-04-23 19:41 ` Arnd Bergmann
2013-04-23 19:55 ` Marc Dietrich
2013-04-23 20:05 ` Greg Kroah-Hartman
2013-04-23 20:14 ` Arnd Bergmann
2013-04-23 20:21 ` Marc Dietrich
2013-04-23 16:30 ` [PATCH 15/21] staging: comedi/dawboard2000: use mdelay for large delays Arnd Bergmann
2013-04-23 16:46 ` H Hartley Sweeten
2013-04-23 16:30 ` [PATCH 16/21] staging/zsmalloc: don't use pgtable-mapping from modules Arnd Bergmann
2013-04-23 16:30 ` [PATCH 17/21] tty/serial/sirf: fix MODULE_DEVICE_TABLE Arnd Bergmann
2013-04-23 16:30 ` [PATCH 18/21] usb: phy: tegra: don't call into tegra-ehci directly Arnd Bergmann
2013-04-23 16:42 ` Alan Stern
2013-04-23 19:02 ` Arnd Bergmann
2013-04-23 17:17 ` Greg Kroah-Hartman
2013-04-23 19:05 ` [PATCH v2] " Arnd Bergmann
2013-04-23 16:30 ` [PATCH 19/21] usb: phy: don't mark usb_bind_phy as __init Arnd Bergmann
2013-04-23 17:17 ` Greg Kroah-Hartman
2013-04-23 19:07 ` [PATCH v2] " Arnd Bergmann
2013-04-23 19:30 ` Felipe Balbi
2013-04-23 19:46 ` Arnd Bergmann
2013-04-23 16:30 ` [PATCH 20/21] MFD: ab8500: export ab8500_gpadc_sw_hw_convert properly Arnd Bergmann
2013-04-26 8:13 ` Linus Walleij
2013-04-26 9:23 ` Samuel Ortiz
2013-04-23 16:30 ` [PATCH 21/21] mtd: omap2: allow bulding as a module Arnd Bergmann
2013-04-23 18:03 ` Tony Lindgren
2013-04-24 5:34 ` Gupta, Pekon
2013-04-29 13:34 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5176BD29.1000405@linaro.org \
--to=daniel.lezcano@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).