Merge branch 'akpm' (patches from Andrew Morton)

[~andy/linux] / kernel / pid_namespace.c

diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
index bea15bdf82b04c28d2f5d8c1a32a46b2621cb295..6917e8edb48e7702714041737657f1e3949bc849 100644 (file)
--- a/kernel/pid_namespace.c
+++ b/kernel/pid_namespace.c
@@ -15,12 +15,10 @@
 #include <linux/err.h>
 #include <linux/acct.h>
 #include <linux/slab.h>
-#include <linux/proc_fs.h>
+#include <linux/proc_ns.h>
 #include <linux/reboot.h>
 #include <linux/export.h>
 
-#define BITS_PER_PAGE          (PAGE_SIZE*8)
-
 struct pid_cache {
        int nr_ids;
        char name[16];