diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2013-07-23 15:45:51 +0200 |
|---|---|---|
| committer | Anders Roxell <anders.roxell@linaro.org> | 2013-11-25 13:29:04 +0100 |
| commit | 746399b7503ed8c36e525f277df9367f78616dfa (patch) | |
| tree | 1b2996c9011b32011924fcb1bcb933cc2f742fbe /include | |
| parent | 9d1fb11957d12ad542dc3f8a77ac363b77a809e2 (diff) | |
vtime-split-lock-and-seqcount.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include')
| -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 5cd0f0949927..b59240bdd48c 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 424ed9751ddf..c08e9e0daa22 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1167,7 +1167,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, |