diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2013-07-23 13:45:51 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-05-14 18:37:43 (GMT) |
| commit | 4775f3736954b34f786dc2f1b3000549be0419c3 (patch) | |
| tree | d4b6b9576e9e7a36bb7e8452e17df8701350d6ee /include/linux | |
| parent | 6d5cb1c7ed449031886f0c85e40094fcda863474 (diff) | |
| download | linux-fsl-qoriq-4775f3736954b34f786dc2f1b3000549be0419c3.tar.xz | |
vtime-split-lock-and-seqcount.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/init_task.h | 3 | ||||
| -rw-r--r-- | include/linux/sched.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/init_task.h b/include/linux/init_task.h index 5cd0f09..b59240b 100644 --- a/include/linux/init_task.h +++ b/include/linux/init_task.h @@ -145,7 +145,8 @@ extern struct task_group root_task_group; #ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN # define INIT_VTIME(tsk) \ - .vtime_seqlock = __SEQLOCK_UNLOCKED(tsk.vtime_seqlock), \ + .vtime_lock = __RAW_SPIN_LOCK_UNLOCKED(tsk.vtime_lock), \ + .vtime_seq = SEQCNT_ZERO, \ .vtime_snap = 0, \ .vtime_snap_whence = VTIME_SYS, #else diff --git a/include/linux/sched.h b/include/linux/sched.h index d63aba2..465e66d 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1159,7 +1159,8 @@ struct task_struct { struct cputime prev_cputime; #endif #ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN - seqlock_t vtime_seqlock; + raw_spinlock_t vtime_lock; + seqcount_t vtime_seq; unsigned long long vtime_snap; enum { VTIME_SLEEPING = 0, |