The patch titled cpumask: remove bitmap_scnprintf_len and cpumask_scnprintf_len has been added to the -mm tree. Its filename is cpumask-remove-bitmap_scnprintf_len-and-cpumask_scnprintf_len.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: cpumask: remove bitmap_scnprintf_len and cpumask_scnprintf_len From: Paul Jackson <pj@xxxxxxx> They aren't used. They were briefly used as part of some other patches to provide an alternative format for displaying some /proc and /sys cpumasks. They probably should have been removed when those other patches were dropped, in favor of a different solution. Signed-off-by: Paul Jackson <pj@xxxxxxx> Cc: "Mike Travis" <travis@xxxxxxx> Cc: "Bert Wesarg" <bert.wesarg@xxxxxxxxxxxxxx> Cc: Alexey Dobriyan <adobriyan@xxxxxxxxx> Cc: WANG Cong <xiyou.wangcong@xxxxxxxxx> 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 deletions(-) diff -puN include/linux/bitmap.h~cpumask-remove-bitmap_scnprintf_len-and-cpumask_scnprintf_len include/linux/bitmap.h --- a/include/linux/bitmap.h~cpumask-remove-bitmap_scnprintf_len-and-cpumask_scnprintf_len +++ a/include/linux/bitmap.h @@ -110,7 +110,6 @@ 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-remove-bitmap_scnprintf_len-and-cpumask_scnprintf_len include/linux/cpumask.h --- a/include/linux/cpumask.h~cpumask-remove-bitmap_scnprintf_len-and-cpumask_scnprintf_len +++ a/include/linux/cpumask.h @@ -289,13 +289,6 @@ 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-remove-bitmap_scnprintf_len-and-cpumask_scnprintf_len lib/bitmap.c --- a/lib/bitmap.c~cpumask-remove-bitmap_scnprintf_len-and-cpumask_scnprintf_len +++ a/lib/bitmap.c @@ -316,22 +316,6 @@ 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 pj@xxxxxxx are origin.patch fix-cpuset-sched_relax_domain_level-control-file.patch cpumask-remove-bitmap_scnprintf_len-and-cpumask_scnprintf_len.patch linux-next.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