From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoffer Dall Subject: Re: [PATCH 13/16] PSCI: Add initial support for PSCIv0.2 functions Date: Tue, 27 May 2014 11:46:57 +0200 Message-ID: <20140527094657.GI31431@lvm> References: <1401041942-23471-1-git-send-email-christoffer.dall@linaro.org> <1401041942-23471-14-git-send-email-christoffer.dall@linaro.org> <20140527074455.GA7834@dragon> <20140527091849.GH31431@lvm> <53845A6E.1010400@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Shawn Guo , Gleb Natapov , Peter Maydell , Anup Patel , kvm@vger.kernel.org, Marc Zyngier , Ashwin Chaugule , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org To: Paolo Bonzini Return-path: Received: from mail-lb0-f181.google.com ([209.85.217.181]:33550 "EHLO mail-lb0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751658AbaE0JrC (ORCPT ); Tue, 27 May 2014 05:47:02 -0400 Received: by mail-lb0-f181.google.com with SMTP id q8so4840075lbi.12 for ; Tue, 27 May 2014 02:47:00 -0700 (PDT) Content-Disposition: inline In-Reply-To: <53845A6E.1010400@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: On Tue, May 27, 2014 at 11:27:10AM +0200, Paolo Bonzini wrote: > Il 27/05/2014 11:18, Christoffer Dall ha scritto: > >On Tue, May 27, 2014 at 03:44:55PM +0800, Shawn Guo wrote: > >>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/ps= ci.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); > >>> }; > >>> > >>> extern struct psci_operations psci_ops; > >>> extern struct smp_operations psci_smp_ops; > >>> > >>> #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: > >>../arch/arm/include/asm/psci.h: In function =E2=80=98psci_init=E2=80= =99: > >>../arch/arm/include/asm/psci.h:44:1: warning: no return statement i= n function returning non-void [-Wreturn-type] > >> > >Thanks for noticing, I just sent a fixup patch. >=20 > Since this is not a KVM file, I'd rather get a new pull request. >=20 Not sure I see why that makes a difference for a one-line fix patch, bu= t ok. You want a new pull request with just this patch or a new pull request instead of the existing one containing all the PSCI patches + this fixu= p patch? -Christoffer