Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5cc54451 authored by Raphael S.Carvalho's avatar Raphael S.Carvalho Committed by Linus Torvalds
Browse files

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@linux-foundation.org: kernel/pid.c:54:1: warning: "BITS_PER_PAGE" redefined]
Signed-off-by: default avatarRaphael S.Carvalho <raphael.scarv@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8db049b3

include/linux/pid_namespace.h

+3 −1
Original line number Diff line number Diff line
@@ -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;

kernel/pid.c

+0 −3
Original line number Diff line number Diff line
@@ -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)

{

kernel/pid_namespace.c

+0 −2
Original line number Diff line number Diff line
@@ -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];