diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2017-05-01 22:49:28 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-05-01 22:49:28 +0300 |
| commit | a0841609f658c77f066af9c61a2e13143564fcb4 (patch) | |
| tree | 0f0df468b6f852501cd4ed1570701e695b9f5d56 /kernel/fork.c | |
| parent | 77f8f39a2e463eca89a19b916189d0e4e38f75d8 (diff) | |
| parent | e679af627fe875a51d40b9a2b17f08fbde36e0e2 (diff) | |
| download | linux-a0841609f658c77f066af9c61a2e13143564fcb4.tar.xz | |
Merge branches 'for-4.12/upstream' and 'for-4.12/klp-hybrid-consistency-model' into for-linus
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 6c463c80e93d..942cbcd07c18 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -87,6 +87,7 @@ #include <linux/compiler.h> #include <linux/sysctl.h> #include <linux/kcov.h> +#include <linux/livepatch.h> #include <asm/pgtable.h> #include <asm/pgalloc.h> @@ -1797,6 +1798,8 @@ static __latent_entropy struct task_struct *copy_process( p->parent_exec_id = current->self_exec_id; } + klp_copy_process(p); + spin_lock(¤t->sighand->siglock); /* |