Merge branch 'x86/entry' into ras/core

[linux-2.6-block.git] / fs / proc / array.c

diff --git a/fs/proc/array.c b/fs/proc/array.c
index c4ac25fdb230ce1cbc33704075c9af3aa79f6c05..55ecbeb3a7213c7c6c0ff2944e972aae9a721620 100644 (file)
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -92,7 +92,6 @@
 #include <linux/user_namespace.h>
 #include <linux/fs_struct.h>
 
-#include <asm/pgtable.h>
 #include <asm/processor.h>
 #include "internal.h"
 
@@ -728,7 +727,7 @@ static int children_seq_show(struct seq_file *seq, void *v)
 {
        struct inode *inode = file_inode(seq->file);
 
-       seq_printf(seq, "%d ", pid_nr_ns(v, proc_pid_ns(inode)));
+       seq_printf(seq, "%d ", pid_nr_ns(v, proc_pid_ns(inode->i_sb)));
        return 0;
 }