aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2007-10-17 02:31:35 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-17 11:43:07 -0400
commit57c521ce6125e15e99e56c902cb8da96bee7b36d (patch)
treed6337e711db2d3baf6dcff89cf2d2bc1dd12a62f
parent20510f2f4e2dabb0ff6c13901807627ec9452f98 (diff)
ifdef struct task_struct::security
For those who don't care about CONFIG_SECURITY. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Cc: "Serge E. Hallyn" <serge@hallyn.com> Cc: Casey Schaufler <casey@schaufler-ca.com> Cc: James Morris <jmorris@namei.org> Cc: Stephen Smalley <sds@tycho.nsa.gov> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/linux/sched.h3
-rw-r--r--kernel/fork.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 774cb435c7d8..3de5aa210feb 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1044,8 +1044,9 @@ struct task_struct {
1044 int (*notifier)(void *priv); 1044 int (*notifier)(void *priv);
1045 void *notifier_data; 1045 void *notifier_data;
1046 sigset_t *notifier_mask; 1046 sigset_t *notifier_mask;
1047 1047#ifdef CONFIG_SECURITY
1048 void *security; 1048 void *security;
1049#endif
1049 struct audit_context *audit_context; 1050 struct audit_context *audit_context;
1050 seccomp_t seccomp; 1051 seccomp_t seccomp;
1051 1052
diff --git a/kernel/fork.c b/kernel/fork.c
index 3e764f6f2be1..490495a39c7e 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1079,7 +1079,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
1079 do_posix_clock_monotonic_gettime(&p->start_time); 1079 do_posix_clock_monotonic_gettime(&p->start_time);
1080 p->real_start_time = p->start_time; 1080 p->real_start_time = p->start_time;
1081 monotonic_to_bootbased(&p->real_start_time); 1081 monotonic_to_bootbased(&p->real_start_time);
1082#ifdef CONFIG_SECURITY
1082 p->security = NULL; 1083 p->security = NULL;
1084#endif
1083 p->io_context = NULL; 1085 p->io_context = NULL;
1084 p->io_wait = NULL; 1086 p->io_wait = NULL;
1085 p->audit_context = NULL; 1087 p->audit_context = NULL;