git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
[pandora-kernel.git]
/
kernel
/
pid.c
diff --git
a/kernel/pid.c
b/kernel/pid.c
index
d1db36b
..
f815455
100644
(file)
--- a/
kernel/pid.c
+++ b/
kernel/pid.c
@@
-537,6
+537,7
@@
err_alloc:
return NULL;
}
return NULL;
}
+#ifdef CONFIG_PID_NS
static struct pid_namespace *create_pid_namespace(int level)
{
struct pid_namespace *ns;
static struct pid_namespace *create_pid_namespace(int level)
{
struct pid_namespace *ns;
@@
-621,6
+622,7
@@
void free_pid_ns(struct kref *kref)
if (parent != NULL)
put_pid_ns(parent);
}
if (parent != NULL)
put_pid_ns(parent);
}
+#endif /* CONFIG_PID_NS */
void zap_pid_ns_processes(struct pid_namespace *pid_ns)
{
void zap_pid_ns_processes(struct pid_namespace *pid_ns)
{