ARM: bcm2835: dt: Add the DSI module nodes and clocks.

[mirror_ubuntu-zesty-kernel.git] / fs / seq_file.c

diff --git a/fs/seq_file.c b/fs/seq_file.c
index 368bfb92b115c0e99ce4c654f6fdecb6ec5a2763..ca69fb99e41a8872d6d204d8fd8cffe7f08b3336 100644 (file)
--- a/fs/seq_file.c
+++ b/fs/seq_file.c
@@ -15,7 +15,7 @@
 #include <linux/printk.h>
 #include <linux/string_helpers.h>
 
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <asm/page.h>
 
 static void seq_set_overflow(struct seq_file *m)
@@ -190,6 +190,13 @@ ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
         */
        m->version = file->f_version;
 
+       /*
+        * if request is to read from zero offset, reset iterator to first
+        * record as it might have been already advanced by previous requests
+        */
+       if (*ppos == 0)
+               m->index = 0;
+
        /* Don't assume *ppos is where we left it */
        if (unlikely(*ppos != m->read_pos)) {
                while ((err = traverse(m, *ppos)) == -EAGAIN)