[PATCH 2/2] powerpc/smp: Use IS_ENABLED() to avoid #ifdef

Srikar Dronamraju srikar at linux.vnet.ibm.com
Sat Mar 14 01:54:10 AEDT 2020


* Michael Ellerman <mpe at ellerman.id.au> [2020-03-13 22:20:20]:

> We can avoid the #ifdef by using IS_ENABLED() in the existing
> condition check.
> 

Looks good to me.

Reviewed-by: Srikar Dronamraju <srikar at linux.vnet.ibm.com>

> Signed-off-by: Michael Ellerman <mpe at ellerman.id.au>
> ---
>  arch/powerpc/kernel/smp.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
> index aae61a3b3201..6d2a3a3666f0 100644
> --- a/arch/powerpc/kernel/smp.c
> +++ b/arch/powerpc/kernel/smp.c
> @@ -1189,18 +1189,17 @@ int get_physical_package_id(int cpu)
>  {
>  	int pkg_id = cpu_to_chip_id(cpu);
> 
> -#ifdef CONFIG_PPC_SPLPAR
>  	/*
>  	 * If the platform is PowerNV or Guest on KVM, ibm,chip-id is
>  	 * defined. Hence we would return the chip-id as the result of
>  	 * get_physical_package_id.
>  	 */
> -	if (pkg_id == -1 && firmware_has_feature(FW_FEATURE_LPAR)) {
> +	if (pkg_id == -1 && firmware_has_feature(FW_FEATURE_LPAR) &&
> +	    IS_ENABLED(CONFIG_PPC_SPLPAR)) {
>  		struct device_node *np = of_get_cpu_node(cpu, NULL);
>  		pkg_id = of_node_to_nid(np);
>  		of_node_put(np);
>  	}
> -#endif /* CONFIG_PPC_SPLPAR */
> 
>  	return pkg_id;
>  }
> -- 
> 2.21.1
> 

-- 
Thanks and Regards
Srikar Dronamraju



More information about the Linuxppc-dev mailing list