Merge branch 'for-rmk' of git://git.android.com/kernel into devel

1 files changed, 23 insertions, 6 deletions

diff --git a/fs/seq_file.c b/fs/seq_file.c
index bd20f7f5a933..eba2eabcd2b8 100644
--- a/fs/seq_file.c
+++ b/fs/seq_file.c
@@ -452,17 +452,34 @@ int seq_dentry(struct seq_file *m, struct dentry *dentry, char *esc)
 
 int seq_bitmap(struct seq_file *m, unsigned long *bits, unsigned int nr_bits)
 {
-        size_t len = bitmap_scnprintf_len(nr_bits);
+        if (m->count < m->size) {
+                int len = bitmap_scnprintf(m->buf + m->count,
+                                m->size - m->count, bits, nr_bits);
+                if (m->count + len < m->size) {
+                        m->count += len;
+                        return 0;
+                }
+        }
+        m->count = m->size;
+        return -1;
+}
+EXPORT_SYMBOL(seq_bitmap);
 
-        if (m->count + len < m->size) {
-                bitmap_scnprintf(m->buf + m->count, m->size - m->count,
-                                 bits, nr_bits);
-                m->count += len;
-                return 0;
+int seq_bitmap_list(struct seq_file *m, unsigned long *bits,
+                unsigned int nr_bits)
+{
+        if (m->count < m->size) {
+                int len = bitmap_scnlistprintf(m->buf + m->count,
+                                m->size - m->count, bits, nr_bits);
+                if (m->count + len < m->size) {
+                        m->count += len;
+                        return 0;
+                }
         }
         m->count = m->size;
         return -1;
 }
+EXPORT_SYMBOL(seq_bitmap_list);
 
 static void *single_start(struct seq_file *p, loff_t *pos)
 {