diff options
Diffstat (limited to 'kernel/pid.c')
-rw-r--r-- | kernel/pid.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/kernel/pid.c b/kernel/pid.c index 373639a10d84..8234bd08a3cb 100644 --- a/kernel/pid.c +++ b/kernel/pid.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <linux/init.h> | 26 | #include <linux/init.h> |
27 | #include <linux/bootmem.h> | 27 | #include <linux/bootmem.h> |
28 | #include <linux/hash.h> | 28 | #include <linux/hash.h> |
29 | #include <linux/pspace.h> | ||
29 | 30 | ||
30 | #define pid_hashfn(nr) hash_long((unsigned long)nr, pidhash_shift) | 31 | #define pid_hashfn(nr) hash_long((unsigned long)nr, pidhash_shift) |
31 | static struct hlist_head *pid_hash; | 32 | static struct hlist_head *pid_hash; |
@@ -40,7 +41,6 @@ int last_pid; | |||
40 | int pid_max_min = RESERVED_PIDS + 1; | 41 | int pid_max_min = RESERVED_PIDS + 1; |
41 | int pid_max_max = PID_MAX_LIMIT; | 42 | int pid_max_max = PID_MAX_LIMIT; |
42 | 43 | ||
43 | #define PIDMAP_ENTRIES ((PID_MAX_LIMIT + 8*PAGE_SIZE - 1)/PAGE_SIZE/8) | ||
44 | #define BITS_PER_PAGE (PAGE_SIZE*8) | 44 | #define BITS_PER_PAGE (PAGE_SIZE*8) |
45 | #define BITS_PER_PAGE_MASK (BITS_PER_PAGE-1) | 45 | #define BITS_PER_PAGE_MASK (BITS_PER_PAGE-1) |
46 | #define mk_pid(map, off) (((map) - pidmap_array)*BITS_PER_PAGE + (off)) | 46 | #define mk_pid(map, off) (((map) - pidmap_array)*BITS_PER_PAGE + (off)) |
@@ -53,11 +53,6 @@ int pid_max_max = PID_MAX_LIMIT; | |||
53 | * value does not cause lots of bitmaps to be allocated, but | 53 | * value does not cause lots of bitmaps to be allocated, but |
54 | * the scheme scales to up to 4 million PIDs, runtime. | 54 | * the scheme scales to up to 4 million PIDs, runtime. |
55 | */ | 55 | */ |
56 | struct pidmap { | ||
57 | atomic_t nr_free; | ||
58 | void *page; | ||
59 | }; | ||
60 | |||
61 | static struct pidmap pidmap_array[PIDMAP_ENTRIES] = | 56 | static struct pidmap pidmap_array[PIDMAP_ENTRIES] = |
62 | { [ 0 ... PIDMAP_ENTRIES-1 ] = { ATOMIC_INIT(BITS_PER_PAGE), NULL } }; | 57 | { [ 0 ... PIDMAP_ENTRIES-1 ] = { ATOMIC_INIT(BITS_PER_PAGE), NULL } }; |
63 | 58 | ||