projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libata: improve AC_ERR_DEV handling for ->post_internal_cmd
[powerpc.git]
/
kernel
/
pid.c
diff --git
a/kernel/pid.c
b/kernel/pid.c
index
1d9cc26
..
78f2aee
100644
(file)
--- a/
kernel/pid.c
+++ b/
kernel/pid.c
@@
-65,7
+65,8
@@
struct pid_namespace init_pid_ns = {
.pidmap = {
[ 0 ... PIDMAP_ENTRIES-1] = { ATOMIC_INIT(BITS_PER_PAGE), NULL }
},
.pidmap = {
[ 0 ... PIDMAP_ENTRIES-1] = { ATOMIC_INIT(BITS_PER_PAGE), NULL }
},
- .last_pid = 0
+ .last_pid = 0,
+ .child_reaper = &init_task
};
/*
};
/*
@@
-196,7
+197,7
@@
fastcall void free_pid(struct pid *pid)
hlist_del_rcu(&pid->pid_chain);
spin_unlock_irqrestore(&pidmap_lock, flags);
hlist_del_rcu(&pid->pid_chain);
spin_unlock_irqrestore(&pidmap_lock, flags);
- free_pidmap(
current->nsproxy->
pid_ns, pid->nr);
+ free_pidmap(
&init_
pid_ns, pid->nr);
call_rcu(&pid->rcu, delayed_put_pid);
}
call_rcu(&pid->rcu, delayed_put_pid);
}