The patch titled
ifdef struct task_struct::security
has been removed from the -mm tree. Its filename was
ifdef-struct-task_structsecurity.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: ifdef struct task_struct::security
From: Alexey Dobriyan <adobriyan@xxxxxxxxx>
For those who don't care about CONFIG_SECURITY.
Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Cc: "Serge E. Hallyn" <serge@xxxxxxxxxx>
Cc: Casey Schaufler <casey@xxxxxxxxxxxxxxxx>
Cc: James Morris <jmorris@xxxxxxxxx>
Cc: Stephen Smalley <sds@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/sched.h | 3 ++-
kernel/fork.c | 2 ++
2 files changed, 4 insertions(+), 1 deletion(-)
diff -puN include/linux/sched.h~ifdef-struct-task_structsecurity include/linux/sched.h
--- a/include/linux/sched.h~ifdef-struct-task_structsecurity
+++ a/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 -puN kernel/fork.c~ifdef-struct-task_structsecurity kernel/fork.c
--- a/kernel/fork.c~ifdef-struct-task_structsecurity
+++ a/kernel/fork.c
@@ -1079,7 +1079,9 @@ static struct task_struct *copy_process(
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;
_
Patches currently in -mm which might be from adobriyan@xxxxxxxxx are
origin.patch
remove-struct-task_structio_wait.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
