From 17af14083984fcbc28ab604b1816f31d608a8a8a Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Tue, 16 Oct 2007 23:31:35 -0700
Subject: [PATCH] --- yaml --- r: 70804 b: refs/heads/master c:
 57c521ce6125e15e99e56c902cb8da96bee7b36d h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/include/linux/sched.h | 3 ++-
 trunk/kernel/fork.c         | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 485a331d327d..ec2845627c74 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20510f2f4e2dabb0ff6c13901807627ec9452f98
+refs/heads/master: 57c521ce6125e15e99e56c902cb8da96bee7b36d
diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h
index 774cb435c7d8..3de5aa210feb 100644
--- a/trunk/include/linux/sched.h
+++ b/trunk/include/linux/sched.h
@@ -1044,8 +1044,9 @@ struct task_struct {
 	int (*notifier)(void *priv);
 	void *notifier_data;
 	sigset_t *notifier_mask;
-	
+#ifdef CONFIG_SECURITY
 	void *security;
+#endif
 	struct audit_context *audit_context;
 	seccomp_t seccomp;
 
diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c
index 3e764f6f2be1..490495a39c7e 100644
--- a/trunk/kernel/fork.c
+++ b/trunk/kernel/fork.c
@@ -1079,7 +1079,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
 	do_posix_clock_monotonic_gettime(&p->start_time);
 	p->real_start_time = p->start_time;
 	monotonic_to_bootbased(&p->real_start_time);
+#ifdef CONFIG_SECURITY
 	p->security = NULL;
+#endif
 	p->io_context = NULL;
 	p->io_wait = NULL;
 	p->audit_context = NULL;