summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2013-07-23 13:45:51 (GMT)
committerScott Wood <scottwood@freescale.com>2015-02-13 22:20:07 (GMT)
commitb9c665d32bcbc8d39eddeb31649f5ca9ff1a378c (patch)
treeb95a0be6ce0b9df63d9da5d4f114c426038e30ff /include
parentfa5f1ad2efe7b9e1b36a37e99b7c99d59b4b92d2 (diff)
downloadlinux-fsl-qoriq-b9c665d32bcbc8d39eddeb31649f5ca9ff1a378c.tar.xz
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.h3
-rw-r--r--include/linux/sched.h3
2 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index 998f4df..f23c8c9 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -146,7 +146,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 613ec1b..dffe621 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1168,7 +1168,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,