diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2017-05-01 21:49:28 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-05-01 21:49:28 +0200 |
| commit | a0841609f658c77f066af9c61a2e13143564fcb4 (patch) | |
| tree | 0f0df468b6f852501cd4ed1570701e695b9f5d56 /include/linux/sched.h | |
| parent | 77f8f39a2e463eca89a19b916189d0e4e38f75d8 (diff) | |
| parent | e679af627fe875a51d40b9a2b17f08fbde36e0e2 (diff) | |
Merge branches 'for-4.12/upstream' and 'for-4.12/klp-hybrid-consistency-model' into for-linus
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index d67eee84fd43..e11032010318 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1038,6 +1038,9 @@ struct task_struct { /* A live task holds one reference: */ atomic_t stack_refcount; #endif +#ifdef CONFIG_LIVEPATCH + int patch_state; +#endif /* CPU-specific state of this task: */ struct thread_struct thread; |