Re: [patch] x86/AMD: remove an unneeded condition in srat_detect_node()

From: Huang Rui
Date: Thu Jan 14 2016 - 00:49:15 EST


On Wed, Jan 13, 2016 at 03:39:40PM +0300, Dan Carpenter wrote:
> Originally we calculated ht_nodeid as "ht_nodeid = apicid - boot_cpu_id;"
> so presumably it could be negative. But after commit 01aaea1afbcd
> ('x86: introduce initial apicid') we use c->initial_apicid which is an
> unsigned short and thus always >= 0.
>
> It causes a static checker warning to test for impossible conditions so
> let's remove it.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
>

Looks OK for me.

Reviewed-by: Huang Rui <ray.huang@xxxxxxx>

> diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
> index e678dde..a07956a 100644
> --- a/arch/x86/kernel/cpu/amd.c
> +++ b/arch/x86/kernel/cpu/amd.c
> @@ -434,8 +434,7 @@ static void srat_detect_node(struct cpuinfo_x86 *c)
> */
> int ht_nodeid = c->initial_apicid;
>
> - if (ht_nodeid >= 0 &&
> - __apicid_to_node[ht_nodeid] != NUMA_NO_NODE)
> + if (__apicid_to_node[ht_nodeid] != NUMA_NO_NODE)
> node = __apicid_to_node[ht_nodeid];
> /* Pick a nearby node */
> if (!node_online(node))