From mboxrd@z Thu Jan  1 00:00:00 1970
From: Shawn Guo <shawn.guo@freescale.com>
Subject: Re: [PATCH 13/16] PSCI: Add initial support for PSCIv0.2 functions
Date: Tue, 27 May 2014 15:44:55 +0800
Message-ID: <20140527074455.GA7834@dragon>
References: <1401041942-23471-1-git-send-email-christoffer.dall@linaro.org>
 <1401041942-23471-14-git-send-email-christoffer.dall@linaro.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: QUOTED-PRINTABLE
Cc: Paolo Bonzini <pbonzini@redhat.com>,
	Gleb Natapov <gleb@kernel.org>,
	Peter Maydell <peter.maydell@linaro.org>,
	Anup Patel <anup.patel@linaro.org>, <kvm@vger.kernel.org>,
	Marc Zyngier <marc.zyngier@arm.com>,
	Ashwin Chaugule <ashwin.chaugule@linaro.org>,
	<kvmarm@lists.cs.columbia.edu>,
	<linux-arm-kernel@lists.infradead.org>
To: Christoffer Dall <christoffer.dall@linaro.org>
Return-path: <kvm-owner@vger.kernel.org>
Received: from mail-bn1blp0183.outbound.protection.outlook.com ([207.46.163.183]:4716
	"EHLO na01-bn1-obe.outbound.protection.outlook.com"
	rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP
	id S1751540AbaE0HpL (ORCPT <rfc822;kvm@vger.kernel.org>);
	Tue, 27 May 2014 03:45:11 -0400
Content-Disposition: inline
In-Reply-To: <1401041942-23471-14-git-send-email-christoffer.dall@linaro.org>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

On Sun, May 25, 2014 at 08:18:59PM +0200, Christoffer Dall wrote:
> diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.=
h
> index c4ae171..b93e34a 100644
> --- a/arch/arm/include/asm/psci.h
> +++ b/arch/arm/include/asm/psci.h
> @@ -29,16 +29,19 @@ struct psci_operations {
>  	int (*cpu_off)(struct psci_power_state state);
>  	int (*cpu_on)(unsigned long cpuid, unsigned long entry_point);
>  	int (*migrate)(unsigned long cpuid);
> +	int (*affinity_info)(unsigned long target_affinity,
> +			unsigned long lowest_affinity_level);
> +	int (*migrate_info_type)(void);
>  };
> =20
>  extern struct psci_operations psci_ops;
>  extern struct smp_operations psci_smp_ops;
> =20
>  #ifdef CONFIG_ARM_PSCI
> -void psci_init(void);
> +int psci_init(void);
>  bool psci_smp_available(void);
>  #else
> -static inline void psci_init(void) { }
> +static inline int psci_init(void) { }

The change introduces the following compile warning on
imx_v6_v7_defconfig build.

In file included from ../arch/arm/kernel/setup.c:40:0:
=2E./arch/arm/include/asm/psci.h: In function =E2=80=98psci_init=E2=80=99=
:
=2E./arch/arm/include/asm/psci.h:44:1: warning: no return statement in =
function returning non-void [-Wreturn-type]

Shawn

>  static inline bool psci_smp_available(void) { return false; }
>  #endif