Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4ed0dea authored by Paul Jackson's avatar Paul Jackson Committed by Linus Torvalds
Browse files

cpumask: remove bitmap_scnprintf_len and cpumask_scnprintf_len 



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: default avatarPaul Jackson <pj@sgi.com>
Cc: "Mike Travis" <travis@sgi.com>
Cc: "Bert Wesarg" <bert.wesarg@googlemail.com>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: WANG Cong <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 53c78dd1

include/linux/bitmap.h

+0 −1
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ extern int __bitmap_weight(const unsigned long *bitmap, int bits); 


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,

include/linux/cpumask.h

+0 −7
Original line number Diff line number Diff line
@@ -289,13 +289,6 @@ static inline int __cpumask_scnprintf(char *buf, int len, 
	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,

lib/bitmap.c

+0 −16
Original line number Diff line number Diff line
@@ -315,22 +315,6 @@ int bitmap_scnprintf(char *buf, unsigned int buflen, 
}

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.