The patch titled Subject: pid_namespace.c/.h: simplify defines has been removed from the -mm tree. Its filename was pid_namespacec-h-simplify-defines.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: "Raphael S.Carvalho" <raphael.scarv@xxxxxxxxx> Subject: pid_namespace.c/.h: simplify defines Move BITS_PER_PAGE from pid_namespace.c to pid_namespace.h, since we can simplify the define PID_MAP_ENTRIES by using the BITS_PER_PAGE. [akpm@xxxxxxxxxxxxxxxxxxxx: kernel/pid.c:54:1: warning: "BITS_PER_PAGE" redefined] Signed-off-by: Raphael S.Carvalho <raphael.scarv@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/pid_namespace.h | 4 +++- kernel/pid.c | 3 --- kernel/pid_namespace.c | 2 -- 3 files changed, 3 insertions(+), 6 deletions(-) diff -puN include/linux/pid_namespace.h~pid_namespacec-h-simplify-defines include/linux/pid_namespace.h --- a/include/linux/pid_namespace.h~pid_namespacec-h-simplify-defines +++ a/include/linux/pid_namespace.h @@ -13,7 +13,9 @@ struct pidmap { void *page; }; -#define PIDMAP_ENTRIES ((PID_MAX_LIMIT + 8*PAGE_SIZE - 1)/PAGE_SIZE/8) +#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 -puN kernel/pid.c~pid_namespacec-h-simplify-defines kernel/pid.c --- a/kernel/pid.c~pid_namespacec-h-simplify-defines +++ a/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) { diff -puN kernel/pid_namespace.c~pid_namespacec-h-simplify-defines kernel/pid_namespace.c --- a/kernel/pid_namespace.c~pid_namespacec-h-simplify-defines +++ a/kernel/pid_namespace.c @@ -19,8 +19,6 @@ #include <linux/reboot.h> #include <linux/export.h> -#define BITS_PER_PAGE (PAGE_SIZE*8) - struct pid_cache { int nr_ids; char name[16]; _ Patches currently in -mm which might be from raphael.scarv@xxxxxxxxx are origin.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html