pid_namespacec-h-simplify-defines-fix

kernel/pid.c:54:1: warning: "BITS_PER_PAGE" redefined

Cc: Raphael S.Carvalho <raphael.scarv@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h
index e4ae94521e49e4b9c8d430dd1c91c0f487088c92..8ac32836690e3a50ce25d89187ac7c42193e8835 100644 (file)
--- a/include/linux/pid_namespace.h
+++ b/include/linux/pid_namespace.h
@@ -14,6 +14,7 @@ struct pidmap {
 };
 
 #define BITS_PER_PAGE          (PAGE_SIZE * 8)
+#define BITS_PER_PAGE_MASK     (BITS_PER_PAGE-1)
 #define PIDMAP_ENTRIES         ((PID_MAX_LIMIT+BITS_PER_PAGE-1)/BITS_PER_PAGE)
 
 struct bsd_acct_struct;

diff --git a/kernel/pid.c b/kernel/pid.c
index 8147bdf22f36a498f0ed108be8e50b20d5f02ed5..6283d6412affd58763657141aeec206cb1a32d02 100644 (file)
--- a/kernel/pid.c
+++ b/kernel/pid.c
@@ -51,9 +51,6 @@ int pid_max = PID_MAX_DEFAULT;
 int pid_max_min = RESERVED_PIDS + 1;
 int pid_max_max = PID_MAX_LIMIT;
 
-#define BITS_PER_PAGE          (PAGE_SIZE*8)
-#define BITS_PER_PAGE_MASK     (BITS_PER_PAGE-1)
-
 static inline int mk_pid(struct pid_namespace *pid_ns,
                struct pidmap *map, int off)
 {