diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-09-21 16:38:09 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-09-21 16:38:09 -0700 |
| commit | 95a0c7c2d6cfde3fb5fdb713428ed0df4d6bdd58 (patch) | |
| tree | eed1998bf14a6193c3f1ccd9b2b638fba6f69088 /include/linux/init_task.h | |
| parent | 1dbc080c9ef6bcfba652ef0d6ae919b8c7c85a1d (diff) | |
| parent | a205425658dead19bb1b8ac00584aed98e60dde2 (diff) | |
Merge tag 'ib-mfd-many-v4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into next
Merge "Immutable branch between MFD and many other subsystems due for
the v4.14 merge window" to get the TWL headers moved to the right place.
Diffstat (limited to 'include/linux/init_task.h')
| -rw-r--r-- | include/linux/init_task.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/init_task.h b/include/linux/init_task.h index e049526bc188..a2f6707e9fc0 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h @@ -170,9 +170,9 @@ extern struct cred init_cred; #ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN # define INIT_VTIME(tsk) \ - .vtime_seqcount = SEQCNT_ZERO(tsk.vtime_seqcount), \ - .vtime_snap = 0, \ - .vtime_snap_whence = VTIME_SYS, + .vtime.seqcount = SEQCNT_ZERO(tsk.vtime.seqcount), \ + .vtime.starttime = 0, \ + .vtime.state = VTIME_SYS, #else # define INIT_VTIME(tsk) #endif |