[PATCH 5/7] powerpc numa: Consolidate handling of Power4 special case

[Jon Mason]

On Mon, Mar 20, 2006 at 06:36:15PM -0600, Nathan Lynch wrote:
> Code to handle Power4's invalid node id (0xffff) is duplicated for cpu
> and memory.  Better to handle this case in one place --
> of_node_to_nid.  Overall behavior should be unchanged.
> 
> Signed-off-by: Nathan Lynch <nathanl at austin.ibm.com>
> 
> ---
> 
>  arch/powerpc/mm/numa.c |   23 +++++++++++------------
>  1 files changed, 11 insertions(+), 12 deletions(-)
> 
> d9dd3889e58eeb34d1130d2514fea905ca2cab6a
> diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
> index e511ca1..4a6cbb0 100644
> --- a/arch/powerpc/mm/numa.c
> +++ b/arch/powerpc/mm/numa.c
> @@ -207,6 +207,11 @@ static int of_node_to_nid(struct device_
>  		    device->full_name);
>  		nid = 0;
>  	}
> +
> +	/* POWER4 LPAR uses 0xffff as invalid node */
> +	if (nid == 0xffff)

A #define for 0xffff would make the code much nicer.  Something like
POWER4_LPAR_INVALID_NODEID could also enable you to remove the above
comment.

Thanks,
Jon

> +		nid = 0;
> +
>  	return nid;
>  }
>  
> @@ -297,14 +302,9 @@ static int __cpuinit numa_setup_cpu(unsi
>  	nid = of_node_to_nid(cpu);
>  
>  	if (nid >= num_online_nodes()) {
> -		/*
> -		 * POWER4 LPAR uses 0xffff as invalid node,
> -		 * dont warn in this case.
> -		 */
> -		if (nid != 0xffff)
> -			printk(KERN_ERR "WARNING: cpu %ld "
> -			       "maps to invalid NUMA node %d\n",
> -			       lcpu, nid);
> +		printk(KERN_ERR "WARNING: cpu %ld "
> +		       "maps to invalid NUMA node %d\n",
> +		       lcpu, nid);
>  		nid = 0;
>  	}
>  out:
> @@ -442,10 +442,9 @@ new_range:
>  		nid = of_node_to_nid(memory);
>  
>  		if (nid >= MAX_NUMNODES) {
> -			if (nid != 0xffff)
> -				printk(KERN_ERR "WARNING: memory at %lx maps "
> -				       "to invalid NUMA node %d\n", start,
> -				       nid);
> +			printk(KERN_ERR "WARNING: memory at %lx maps "
> +			       "to invalid NUMA node %d\n", start,
> +			       nid);
>  			nid = 0;
>  		}
>  
> -- 
> 1.2.4
> 
> 
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev at ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-dev