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/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); > >>> }; > >>> > >>> 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 ‘psci_init’: > >>../arch/arm/include/asm/psci.h:44:1: warning: no return statement in > >>function returning non-void [-Wreturn-type] > >> > >Thanks for noticing, I just sent a fixup patch. > > Since this is not a KVM file, I'd rather get a new pull request. >
Not sure I see why that makes a difference for a one-line fix patch, but 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 fixup patch? -Christoffer -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html