fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / linux / seq_file.h

diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
index 850a974..3e3cccb 100644 (file)
--- a/include/linux/seq_file.h
+++ b/include/linux/seq_file.h
@@ -4,7 +4,7 @@
 
 #include <linux/types.h>
 #include <linux/string.h>
-#include <asm/semaphore.h>
+#include <linux/mutex.h>
 
 struct seq_operations;
 struct file;
@@ -19,8 +19,8 @@ struct seq_file {
        size_t count;
        loff_t index;
        loff_t version;
-       struct semaphore sem;
-       struct seq_operations *op;
+       struct mutex lock;
+       const struct seq_operations *op;
        void *private;
 };
 
@@ -31,7 +31,7 @@ struct seq_operations {
        int (*show) (struct seq_file *m, void *v);
 };
 
-int seq_open(struct file *, struct seq_operations *);
+int seq_open(struct file *, const struct seq_operations *);
 ssize_t seq_read(struct file *, char __user *, size_t, loff_t *);
 loff_t seq_lseek(struct file *, loff_t, int);
 int seq_release(struct inode *, struct file *);