The patch titled
Move pidmap to pspace.h
has been added to the -mm tree. Its filename is
move-pidmap-to-pspaceh.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Move pidmap to pspace.h
From: Sukadev Bhattiprolu <sukadev@xxxxxxxxxx>
Move struct pidmap and PIDMAP_ENTRIES to a new file, include/linux/pspace.h
where it will be used in subsequent patches to define pid spaces.
Its a subset of Eric Biederman's patch http://lkml.org/lkml/2006/2/6/285
Signed-off-by: Eric W. Biederman <ebiederm@xxxxxxxxxxxx>
Signed-off-by: Sukadev Bhattiprolu <sukadev@xxxxxxxxxx>
Cc: Dave Hansen <haveblue@xxxxxxxxxx>
Cc: Serge Hallyn <serue@xxxxxxxxxx>
Cc: Cedric Le Goater <clg@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/linux/pspace.h | 17 +++++++++++++++++
kernel/pid.c | 7 +------
2 files changed, 18 insertions(+), 6 deletions(-)
diff -puN /dev/null include/linux/pspace.h
--- /dev/null
+++ a/include/linux/pspace.h
@@ -0,0 +1,17 @@
+#ifndef _LINUX_PSPACE_H
+#define _LINUX_PSPACE_H
+
+#include <linux/sched.h>
+#include <linux/threads.h>
+#include <linux/pid.h>
+
+typedef struct pidmap
+{
+ atomic_t nr_free;
+ void *page;
+} pidmap_t;
+
+#define PIDMAP_ENTRIES ((PID_MAX_LIMIT + 8*PAGE_SIZE - 1)/PAGE_SIZE/8)
+
+
+#endif /* _LINUX_PSPACE_H */
diff -puN kernel/pid.c~move-pidmap-to-pspaceh kernel/pid.c
--- a/kernel/pid.c~move-pidmap-to-pspaceh
+++ a/kernel/pid.c
@@ -26,6 +26,7 @@
#include <linux/init.h>
#include <linux/bootmem.h>
#include <linux/hash.h>
+#include <linux/pspace.h>
#define pid_hashfn(nr) hash_long((unsigned long)nr, pidhash_shift)
static struct hlist_head *pid_hash;
@@ -40,7 +41,6 @@ int last_pid;
int pid_max_min = RESERVED_PIDS + 1;
int pid_max_max = PID_MAX_LIMIT;
-#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 mk_pid(map, off) (((map) - pidmap_array)*BITS_PER_PAGE + (off))
@@ -53,11 +53,6 @@ int pid_max_max = PID_MAX_LIMIT;
* value does not cause lots of bitmaps to be allocated, but
* the scheme scales to up to 4 million PIDs, runtime.
*/
-struct pidmap {
- atomic_t nr_free;
- void *page;
-};
-
static struct pidmap pidmap_array[PIDMAP_ENTRIES] =
{ [ 0 ... PIDMAP_ENTRIES-1 ] = { ATOMIC_INIT(BITS_PER_PAGE), NULL } };
_
Patches currently in -mm which might be from sukadev@xxxxxxxxxx are
kthread-airoc.patch
kthread-drivers-base-firmware_classc.patch
pidspace-is_init.patch
pids-coding-style-use-struct-pidmap.patch
move-pidmap-to-pspaceh.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
