[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20100511104334.E572.A69D9226@jp.fujitsu.com>
Date: Tue, 11 May 2010 10:47:03 +0900 (JST)
From: KOSAKI Motohiro <kosaki.motohiro@...fujitsu.com>
To: Rusty Russell <rusty@...tcorp.com.au>
Cc: kosaki.motohiro@...fujitsu.com, Arnd Bergmann <arnd@...db.de>,
linux-kernel@...r.kernel.org, stable@...nel.org,
Andi Kleen <andi@...stfloor.org>,
Ken Werner <ken.werner@....de>
Subject: Re: cpumask: fix compat getaffinity
> How's this?
>
> cpumask: use nr_cpu_ids for printing and parsing cpumasks
>
> Commit a45185d2d "cpumask: convert kernel/compat.c" broke
> libnuma, which abuses sched_getaffinity to find out NR_CPUS
> in order to parse /sys/devices/system/node/node*/cpumap.
>
> However, the result now returned reflects nr_cpu_ids, and
> cpumask_scnprintf et al. use nr_cpumask_bits which is NR_CPUS (for
> CONFIG_CPUMASK_OFFSTACK=n) or nr_cpu_ids (for
> CONFIG_CPUMASK_OFFSTACK=y).
>
> We should use nr_cpu_ids consistently.
>
> Reported-by: Arnd Bergmann <arnd@...db.de>
> Signed-off-by: Rusty Russell <rusty@...tcorp.com.au>
> Cc: stable@...nel.org
Well, This patch seems to have ABI change. please don't send abi-change to -stable.
note: I'm not against this patch itself.
>
> diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
> --- a/include/linux/cpumask.h
> +++ b/include/linux/cpumask.h
> @@ -529,7 +529,7 @@ static inline void cpumask_copy(struct c
> static inline int cpumask_scnprintf(char *buf, int len,
> const struct cpumask *srcp)
> {
> - return bitmap_scnprintf(buf, len, cpumask_bits(srcp), nr_cpumask_bits);
> + return bitmap_scnprintf(buf, len, cpumask_bits(srcp), nr_cpu_ids);
> }
>
> /**
> @@ -543,7 +543,7 @@ static inline int cpumask_scnprintf(char
> static inline int cpumask_parse_user(const char __user *buf, int len,
> struct cpumask *dstp)
> {
> - return bitmap_parse_user(buf, len, cpumask_bits(dstp), nr_cpumask_bits);
> + return bitmap_parse_user(buf, len, cpumask_bits(dstp), nr_cpu_ids);
> }
>
> /**
> @@ -558,8 +558,7 @@ static inline int cpumask_parse_user(con
> static inline int cpulist_scnprintf(char *buf, int len,
> const struct cpumask *srcp)
> {
> - return bitmap_scnlistprintf(buf, len, cpumask_bits(srcp),
> - nr_cpumask_bits);
> + return bitmap_scnlistprintf(buf, len, cpumask_bits(srcp), nr_cpu_ids);
> }
>
> /**
> @@ -572,7 +571,7 @@ static inline int cpulist_scnprintf(char
> */
> static inline int cpulist_parse(const char *buf, struct cpumask *dstp)
> {
> - return bitmap_parselist(buf, cpumask_bits(dstp), nr_cpumask_bits);
> + return bitmap_parselist(buf, cpumask_bits(dstp), nr_cpu_ids);
> }
>
> /**
> --
> 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/
--
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/
Powered by blists - more mailing lists