linux-kernel - Re: [patch 2/2] x86, numa: Fix cpu nodemasks for NUMA emulation and CONFIG_DEBUG_PER_CPU

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <alpine.DEB.2.00.1104211241280.5829@chino.kir.corp.google.com>
Date:	Thu, 21 Apr 2011 12:43:21 -0700 (PDT)
From:	David Rientjes <rientjes@...gle.com>
To:	KOSAKI Motohiro <kosaki.motohiro@...fujitsu.com>
cc:	Linus Torvalds <torvalds@...ux-foundation.org>,
	Ingo Molnar <mingo@...e.hu>,
	Andreas Herrmann <herrmann.der.user@...glemail.com>,
	linux-kernel@...r.kernel.org, Tejun Heo <tj@...nel.org>,
	x86@...nel.org
Subject: Re: [patch 2/2] x86, numa: Fix cpu nodemasks for NUMA emulation and
 CONFIG_DEBUG_PER_CPU_MAPS

On Thu, 21 Apr 2011, KOSAKI Motohiro wrote:

> From aaca24826696f7911bd66380baa18cfbe4f4b18e Mon Sep 17 00:00:00 2001
> From: KOSAKI Motohiro <kosaki.motohiro@...fujitsu.com>
> Date: Thu, 21 Apr 2011 14:01:42 +0900
> Subject: [PATCH] Fix
> 
> debug_cpumask_set_cpu() has tree return statement. we have change
> rest two return statement.
> 
> Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@...fujitsu.com>
> ---
>  arch/x86/mm/numa.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
> index 0471b1d6..745258d 100644
> --- a/arch/x86/mm/numa.c
> +++ b/arch/x86/mm/numa.c
> @@ -220,7 +220,7 @@ void debug_cpumask_set_cpu(int cpu, int node, bool enable)
>  
>  	if (node == NUMA_NO_NODE) {
>  		/* early_cpu_to_node() already emits a warning and trace */
> -		return NULL;
> +		return;
>  	}
>  	mask = node_to_cpumask_map[node];
>  	if (!mask) {
> @@ -238,7 +238,7 @@ void debug_cpumask_set_cpu(int cpu, int node, bool enable)
>  	printk(KERN_DEBUG "%s cpu %d node %d: mask now %s\n",
>  		enable ? "numa_add_cpu" : "numa_remove_cpu",
>  		cpu, node, buf);
> -	return mask;
> +	return;
>  }
>  
>  # ifndef CONFIG_NUMA_EMU

Yes, it looks like Ingo fixed that up when it was merged in the latest 
git as 7a6c6547825a, thanks for pointing it out.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/