Merge branch 'upstream'

[~andy/linux] / kernel / pid.c

diff --git a/kernel/pid.c b/kernel/pid.c
index 7781d9999058337f12618910b81cea8c0ee1c0f0..a9f2dfd006d2d7ddee6f6413cbe82d793a6fc3e7 100644 (file)
--- a/kernel/pid.c
+++ b/kernel/pid.c
@@ -247,16 +247,8 @@ void __init pidhash_init(void)
 
 void __init pidmap_init(void)
 {
-       int i;
-
        pidmap_array->page = (void *)get_zeroed_page(GFP_KERNEL);
+       /* Reserve PID 0. We never call free_pidmap(0) */
        set_bit(0, pidmap_array->page);
        atomic_dec(&pidmap_array->nr_free);
-
-       /*
-        * Allocate PID 0, and hash it via all PID types:
-        */
-
-       for (i = 0; i < PIDTYPE_MAX; i++)
-               attach_pid(current, i, 0);
 }