From 721a11b1b537b57d4257d9548be78f501e2a7a19 Mon Sep 17 00:00:00 2001
From: Paul Jackson <pj@sgi.com>
Date: Mon, 12 May 2008 14:02:29 -0700
Subject: [PATCH] --- yaml --- r: 96489 b: refs/heads/master c:
 f4ed0deae8983591264d0e194e168ef65f4775f5 h: refs/heads/master i:   96487:
 411b20f4bbe039b81f2e1e1f4bcdc6e7866ec400 v: v3

---
 [refs]                        |  2 +-
 trunk/include/linux/bitmap.h  |  1 -
 trunk/include/linux/cpumask.h |  7 -------
 trunk/lib/bitmap.c            | 16 ----------------
 4 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/[refs] b/[refs]
index 5a5e9069992b..b8b8f7d687fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53c78dd1718b99dc365ff8a2244d7d4504b070a5
+refs/heads/master: f4ed0deae8983591264d0e194e168ef65f4775f5
diff --git a/trunk/include/linux/bitmap.h b/trunk/include/linux/bitmap.h
index 43b406def35f..1abfe664c444 100644
--- a/trunk/include/linux/bitmap.h
+++ b/trunk/include/linux/bitmap.h
@@ -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,
diff --git a/trunk/include/linux/cpumask.h b/trunk/include/linux/cpumask.h
index 9650806fe2ea..5df3db58fcc6 100644
--- a/trunk/include/linux/cpumask.h
+++ b/trunk/include/linux/cpumask.h
@@ -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,
diff --git a/trunk/lib/bitmap.c b/trunk/lib/bitmap.c
index c4cb48f77f0c..482df94ea21e 100644
--- a/trunk/lib/bitmap.c
+++ b/trunk/lib/bitmap.c
@@ -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.