diff options
author | Mike Travis <travis@sgi.com> | 2008-03-25 18:06:55 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-19 13:44:58 -0400 |
commit | 30ca60c15a725f655e5d3f14e0238a066bc5aeb7 (patch) | |
tree | 96d36a2cf12e7a964ce4cd0c49d30b2d40f94b52 /include | |
parent | 9f0e738f492522a2f70ad9a2a0287e4e966c633a (diff) |
cpumask: add cpumask_scnprintf_len function
Add a new function cpumask_scnprintf_len() to return the number of
characters needed to display "len" cpumask bits. The current method
of allocating NR_CPUS bytes is incorrect as what's really needed is
9 characters per 32-bit word of cpumask bits (8 hex digits plus the
seperator [','] or the terminating NULL.) This function provides the
caller the means to allocate the correct string length.
Cc: Paul Jackson <pj@sgi.com>
Signed-off-by: Mike Travis <travis@sgi.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/bitmap.h | 1 | ||||
-rw-r--r-- | include/linux/cpumask.h | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h index acad1105d942..1dbe074f1c64 100644 --- a/include/linux/bitmap.h +++ b/include/linux/bitmap.h | |||
@@ -108,6 +108,7 @@ extern int __bitmap_weight(const unsigned long *bitmap, int bits); | |||
108 | 108 | ||
109 | extern int bitmap_scnprintf(char *buf, unsigned int len, | 109 | extern int bitmap_scnprintf(char *buf, unsigned int len, |
110 | const unsigned long *src, int nbits); | 110 | const unsigned long *src, int nbits); |
111 | extern int bitmap_scnprintf_len(unsigned int len); | ||
111 | extern int __bitmap_parse(const char *buf, unsigned int buflen, int is_user, | 112 | extern int __bitmap_parse(const char *buf, unsigned int buflen, int is_user, |
112 | unsigned long *dst, int nbits); | 113 | unsigned long *dst, int nbits); |
113 | extern int bitmap_parse_user(const char __user *ubuf, unsigned int ulen, | 114 | extern int bitmap_parse_user(const char __user *ubuf, unsigned int ulen, |
diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h index 7047f58306a7..67e0e38d32b1 100644 --- a/include/linux/cpumask.h +++ b/include/linux/cpumask.h | |||
@@ -273,6 +273,13 @@ static inline int __cpumask_scnprintf(char *buf, int len, | |||
273 | return bitmap_scnprintf(buf, len, srcp->bits, nbits); | 273 | return bitmap_scnprintf(buf, len, srcp->bits, nbits); |
274 | } | 274 | } |
275 | 275 | ||
276 | #define cpumask_scnprintf_len(len) \ | ||
277 | __cpumask_scnprintf_len((len)) | ||
278 | static inline int __cpumask_scnprintf_len(int len) | ||
279 | { | ||
280 | return bitmap_scnprintf_len(len); | ||
281 | } | ||
282 | |||
276 | #define cpumask_parse_user(ubuf, ulen, dst) \ | 283 | #define cpumask_parse_user(ubuf, ulen, dst) \ |
277 | __cpumask_parse_user((ubuf), (ulen), &(dst), NR_CPUS) | 284 | __cpumask_parse_user((ubuf), (ulen), &(dst), NR_CPUS) |
278 | static inline int __cpumask_parse_user(const char __user *buf, int len, | 285 | static inline int __cpumask_parse_user(const char __user *buf, int len, |