Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=57c521ce6125e15e99e56c902cb8da96bee7b36d
Commit:     57c521ce6125e15e99e56c902cb8da96bee7b36d
Parent:     20510f2f4e2dabb0ff6c13901807627ec9452f98
Author:     Alexey Dobriyan <[EMAIL PROTECTED]>
AuthorDate: Tue Oct 16 23:31:35 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Wed Oct 17 08:43:07 2007 -0700

    ifdef struct task_struct::security
    
    For those who don't care about CONFIG_SECURITY.
    
    Signed-off-by: Alexey Dobriyan <[EMAIL PROTECTED]>
    Cc: "Serge E. Hallyn" <[EMAIL PROTECTED]>
    Cc: Casey Schaufler <[EMAIL PROTECTED]>
    Cc: James Morris <[EMAIL PROTECTED]>
    Cc: Stephen Smalley <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 include/linux/sched.h |    3 ++-
 kernel/fork.c         |    2 ++
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 774cb43..3de5aa2 100644
--- a/include/linux/sched.h
+++ b/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/kernel/fork.c b/kernel/fork.c
index 3e764f6..490495a 100644
--- a/kernel/fork.c
+++ b/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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to