The patch titled
cpumask: Add cpumask_scnprintf_len function
has been removed from the -mm tree. Its filename was
cpumask-add-cpumask_scnprintf_len-function.patch
This patch was dropped because an updated version will be merged
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: cpumask: Add cpumask_scnprintf_len function
From: Mike Travis <travis@xxxxxxx>
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@xxxxxxx>
Signed-off-by: Mike Travis <travis@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/bitmap.h | 1 +
include/linux/cpumask.h | 7 +++++++
lib/bitmap.c | 16 ++++++++++++++++
3 files changed, 24 insertions(+)
diff -puN include/linux/bitmap.h~cpumask-add-cpumask_scnprintf_len-function include/linux/bitmap.h
--- a/include/linux/bitmap.h~cpumask-add-cpumask_scnprintf_len-function
+++ a/include/linux/bitmap.h
@@ -110,6 +110,7 @@ extern int __bitmap_weight(const unsigne
extern int bitmap_scnprintf(char *buf, unsigned int len,
const unsigned long *src, int nbits);
+extern int bitmap_scnprintf_len(unsigned int len);
extern int __bitmap_parse(const char *buf, unsigned int buflen, int is_user,
unsigned long *dst, int nbits);
extern int bitmap_parse_user(const char __user *ubuf, unsigned int ulen,
diff -puN include/linux/cpumask.h~cpumask-add-cpumask_scnprintf_len-function include/linux/cpumask.h
--- a/include/linux/cpumask.h~cpumask-add-cpumask_scnprintf_len-function
+++ a/include/linux/cpumask.h
@@ -277,6 +277,13 @@ static inline int __cpumask_scnprintf(ch
return bitmap_scnprintf(buf, len, srcp->bits, nbits);
}
+#define cpumask_scnprintf_len(len) \
+ __cpumask_scnprintf_len((len))
+static inline int __cpumask_scnprintf_len(int len)
+{
+ return bitmap_scnprintf_len(len);
+}
+
#define cpumask_parse_user(ubuf, ulen, dst) \
__cpumask_parse_user((ubuf), (ulen), &(dst), NR_CPUS)
static inline int __cpumask_parse_user(const char __user *buf, int len,
diff -puN lib/bitmap.c~cpumask-add-cpumask_scnprintf_len-function lib/bitmap.c
--- a/lib/bitmap.c~cpumask-add-cpumask_scnprintf_len-function
+++ a/lib/bitmap.c
@@ -316,6 +316,22 @@ int bitmap_scnprintf(char *buf, unsigned
EXPORT_SYMBOL(bitmap_scnprintf);
/**
+ * bitmap_scnprintf_len - return buffer length needed to convert
+ * bitmap to an ASCII hex string.
+ * @len: number of bits to be converted
+ */
+int bitmap_scnprintf_len(unsigned int len)
+{
+ /* we need 9 chars per word for 32 bit words (8 hexdigits + sep/null) */
+ int bitslen = ALIGN(len, CHUNKSZ);
+ int wordlen = CHUNKSZ / 4;
+ int buflen = (bitslen / wordlen) * (wordlen + 1) * sizeof(char);
+
+ return buflen;
+}
+EXPORT_SYMBOL(bitmap_scnprintf_len);
+
+/**
* __bitmap_parse - convert an ASCII hex string into a bitmap.
* @buf: pointer to buffer containing string.
* @buflen: buffer size in bytes. If string is smaller than this
_
Patches currently in -mm which might be from travis@xxxxxxx are
git-cpufreq.patch
oprofile-change-cpu_buffer-from-array-to-per_cpu-variable.patch
oprofile-change-cpu_buffer-from-array-to-per_cpu-variable-checkpatch-fixes.patch
cpufreq-change-cpu-freq-arrays-to-per_cpu-variables.patch
acpi-change-processors-from-array-to-per_cpu-variable.patch
cpumask-add-cpumask_scnprintf_len-function.patch
cpu-change-cpu_sys_devices-from-array-to-per_cpu-variable.patch
net-remove-nr_cpus-arrays-in-net-core-devc-v2.patch
sched-remove-fixed-nr_cpus-sized-arrays-in-kernel_schedc.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
