Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[pandora-kernel.git] / fs / seq_file.c

diff --git a/fs/seq_file.c b/fs/seq_file.c
index 0cbd049..14cf9de 100644 (file)
--- a/fs/seq_file.c
+++ b/fs/seq_file.c
@@ -385,15 +385,12 @@ int seq_escape(struct seq_file *m, const char *s, const char *esc)
 }
 EXPORT_SYMBOL(seq_escape);
 
-int seq_printf(struct seq_file *m, const char *f, ...)
+int seq_vprintf(struct seq_file *m, const char *f, va_list args)
 {
-       va_list args;
        int len;
 
        if (m->count < m->size) {
-               va_start(args, f);
                len = vsnprintf(m->buf + m->count, m->size - m->count, f, args);
-               va_end(args);
                if (m->count + len < m->size) {
                        m->count += len;
                        return 0;
@@ -402,6 +399,19 @@ int seq_printf(struct seq_file *m, const char *f, ...)
        seq_set_overflow(m);
        return -1;
 }
+EXPORT_SYMBOL(seq_vprintf);
+
+int seq_printf(struct seq_file *m, const char *f, ...)
+{
+       int ret;
+       va_list args;
+
+       va_start(args, f);
+       ret = seq_vprintf(m, f, args);
+       va_end(args);
+
+       return ret;
+}
 EXPORT_SYMBOL(seq_printf);
 
 /**