From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751973AbcF3LtG (ORCPT <rfc822;w@1wt.eu>);
	Thu, 30 Jun 2016 07:49:06 -0400
Received: from down.free-electrons.com ([37.187.137.238]:39564 "EHLO
	mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org
	with ESMTP id S1751547AbcF3LtE (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Thu, 30 Jun 2016 07:49:04 -0400
From: Gregory CLEMENT <gregory.clement@free-electrons.com>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Jason Cooper <jason@lakedaemon.net>, Andrew Lunn <andrew@lunn.ch>,
        Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>,
        Ben Dooks <ben.dooks@codethink.co.uk>,
        Russell King <linux@armlinux.org.uk>,
        Simon Guinot <simon.guinot@sequanux.org>,
        linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] ARM: mvebu: compile pm code conditionally
References: <20160620160931.2714557-1-arnd@arndb.de>
Date: Thu, 30 Jun 2016 13:48:26 +0200
In-Reply-To: <20160620160931.2714557-1-arnd@arndb.de> (Arnd Bergmann's message
	of "Mon, 20 Jun 2016 18:08:22 +0200")
Message-ID: <87lh1mx5h1.fsf@free-electrons.com>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Arnd,
 
 On lun., juin 20 2016, Arnd Bergmann <arnd@arndb.de> wrote:

> A cleanup to include the headers correctly caused another build problem:
>
> arch/arm/mach-mvebu/kirkwood-pm.c:70:13: error: redefinition of 'kirkwood_pm_init'
> arch/arm/mach-mvebu/kirkwood-pm.h:23:20: note: previous definition of 'kirkwood_pm_init' was here
>
> The underlying issue is that kirkwood-pm.o is not actually meant to be
> used when CONFIG_PM is disabled, so we should also leave it out of the
> Makefile.
>
> The same seems to be true for the PM code in MACH_MVEBU_V7, and I'm
> treating it the same way here.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Fixes: d705c1a66e15 ("ARM: Kirkwood: fix kirkwood_pm_init() declaration/type")

Applied on mvebu/fixes

Thanks,

Gregory

> ---
>  arch/arm/mach-mvebu/Makefile | 10 ++++++++--
>  1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile
> index 568863e1513c..6c6497e80a7b 100644
> --- a/arch/arm/mach-mvebu/Makefile
> +++ b/arch/arm/mach-mvebu/Makefile
> @@ -6,9 +6,15 @@ CFLAGS_pmsu.o			:= -march=armv7-a
>  obj-$(CONFIG_MACH_MVEBU_ANY)	 += system-controller.o mvebu-soc-id.o
>  
>  ifeq ($(CONFIG_MACH_MVEBU_V7),y)
> -obj-y				 += cpu-reset.o board-v7.o coherency.o coherency_ll.o pmsu.o pmsu_ll.o pm.o pm-board.o
> +obj-y				 += cpu-reset.o board-v7.o coherency.o coherency_ll.o pmsu.o pmsu_ll.o
> +
> +obj-$(CONFIG_PM)		 += pm.o pm-board.o
>  obj-$(CONFIG_SMP)		 += platsmp.o headsmp.o platsmp-a9.o headsmp-a9.o
>  endif
>  
>  obj-$(CONFIG_MACH_DOVE)		 += dove.o
> -obj-$(CONFIG_MACH_KIRKWOOD)	 += kirkwood.o kirkwood-pm.o
> +
> +ifeq ($(CONFIG_MACH_KIRKWOOD),y)
> +obj-y				 += kirkwood.o
> +obj-$(CONFIG_PM)		 += kirkwood-pm.o
> +endif
> -- 
> 2.9.0
>

-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com