Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull VFS updates from Al Viro,

Misc cleanups all over the place, mainly wrt /proc interfaces (switch
create_proc_entry to proc_create(), get rid of the deprecated
create_proc_read_entry() in favor of using proc_create_data() and
seq_file etc).

7kloc removed.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (204 commits)
  don't bother with deferred freeing of fdtables
  proc: Move non-public stuff from linux/proc_fs.h to fs/proc/internal.h
  proc: Make the PROC_I() and PDE() macros internal to procfs
  proc: Supply a function to remove a proc entry by PDE
  take cgroup_open() and cpuset_open() to fs/proc/base.c
  ppc: Clean up scanlog
  ppc: Clean up rtas_flash driver somewhat
  hostap: proc: Use remove_proc_subtree()
  drm: proc: Use remove_proc_subtree()
  drm: proc: Use minor->index to label things, not PDE->name
  drm: Constify drm_proc_list[]
  zoran: Don't print proc_dir_entry data in debug
  reiserfs: Don't access the proc_dir_entry in r_open(), r_start() r_show()
  proc: Supply an accessor for getting the data from a PDE's parent
  airo: Use remove_proc_subtree()
  rtl8192u: Don't need to save device proc dir PDE
  rtl8187se: Use a dir under /proc/net/r8180/
  proc: Add proc_mkdir_data()
  proc: Move some bits from linux/proc_fs.h to linux/{of.h,signal.h,tty.h}
  proc: Move PDE_NET() to fs/proc/proc_net.c
  ...

1 files changed, 26 insertions, 38 deletions

diff --git a/arch/mips/kernel/smtc-proc.c b/arch/mips/kernel/smtc-proc.c
index aee7c8177b5d..9fb714450e95 100644
--- a/arch/mips/kernel/smtc-proc.c
+++ b/arch/mips/kernel/smtc-proc.c
@@ -16,6 +16,7 @@
 #include <asm/mipsregs.h>
 #include <asm/cacheflush.h>
 #include <linux/proc_fs.h>
+#include <linux/seq_file.h>
 
 #include <asm/smtc_proc.h>
 
@@ -30,51 +31,39 @@ unsigned long selfipis[NR_CPUS];
 
 struct smtc_cpu_proc smtc_cpu_stats[NR_CPUS];
 
-static struct proc_dir_entry *smtc_stats;
-
 atomic_t smtc_fpu_recoveries;
 
-static int proc_read_smtc(char *page, char **start, off_t off,
-                          int count, int *eof, void *data)
+static int smtc_proc_show(struct seq_file *m, void *v)
 {
-        int totalen = 0;
-        int len;
         int i;
         extern unsigned long ebase;
 
-        len = sprintf(page, "SMTC Status Word: 0x%08x\n", smtc_status);
-        totalen += len;
-        page += len;
-        len = sprintf(page, "Config7: 0x%08x\n", read_c0_config7());
-        totalen += len;
-        page += len;
-        len = sprintf(page, "EBASE: 0x%08lx\n", ebase);
-        totalen += len;
-        page += len;
-        len = sprintf(page, "Counter Interrupts taken per CPU (TC)\n");
-        totalen += len;
-        page += len;
-        for (i=0; i < NR_CPUS; i++) {
-                len = sprintf(page, "%d: %ld\n", i, smtc_cpu_stats[i].timerints);
-                totalen += len;
-                page += len;
-        }
-        len = sprintf(page, "Self-IPIs by CPU:\n");
-        totalen += len;
-        page += len;
-        for(i = 0; i < NR_CPUS; i++) {
-                len = sprintf(page, "%d: %ld\n", i, smtc_cpu_stats[i].selfipis);
-                totalen += len;
-                page += len;
-        }
-        len = sprintf(page, "%d Recoveries of \"stolen\" FPU\n",
-                      atomic_read(&smtc_fpu_recoveries));
-        totalen += len;
-        page += len;
+        seq_printf(m, "SMTC Status Word: 0x%08x\n", smtc_status);
+        seq_printf(m, "Config7: 0x%08x\n", read_c0_config7());
+        seq_printf(m, "EBASE: 0x%08lx\n", ebase);
+        seq_printf(m, "Counter Interrupts taken per CPU (TC)\n");
+        for (i=0; i < NR_CPUS; i++)
+                seq_printf(m, "%d: %ld\n", i, smtc_cpu_stats[i].timerints);
+        seq_printf(m, "Self-IPIs by CPU:\n");
+        for(i = 0; i < NR_CPUS; i++)
+                seq_printf(m, "%d: %ld\n", i, smtc_cpu_stats[i].selfipis);
+        seq_printf(m, "%d Recoveries of \"stolen\" FPU\n",
+                   atomic_read(&smtc_fpu_recoveries));
+        return 0;
+}
 
-        return totalen;
+static int smtc_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, smtc_proc_show, NULL);
 }
 
+static const struct file_operations smtc_proc_fops = {
+        .open           = smtc_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = seq_release,
+};
+
 void init_smtc_stats(void)
 {
         int i;
@@ -86,6 +75,5 @@ void init_smtc_stats(void)
 
         atomic_set(&smtc_fpu_recoveries, 0);
 
-        smtc_stats = create_proc_read_entry("smtc", 0444, NULL,
-                                            proc_read_smtc, NULL);
+        proc_create("smtc", 0444, NULL, &smtc_proc_fops);
 }