diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-12-19 12:13:02 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-12-19 12:13:02 +0100 |
| commit | ef0bf620e9b81845368b9c72ffdbd6834e424526 (patch) | |
| tree | 7862e4ca1aa61a20f8e11502276b7f8633a39aa4 /kernel/sched/cputime.c | |
| parent | 425a5072dcd1bd895eea90a6b495392b6358ebd0 (diff) | |
| parent | a6c2f87b8820e956ea0f731dcf0e45949bb37a8b (diff) | |
Merge branch 'irq/wire-msi-bridge' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/core
Pull the MSI wire bridge implementation from Marc Zyngier along with
the first user of it. This is infrastructure to support a wired
interrupt to MSI interrupt brigde. The first user is mbigen found in
Hisilicon ARM SoCs.
Diffstat (limited to 'kernel/sched/cputime.c')
| -rw-r--r-- | kernel/sched/cputime.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c index 26a54461bf59..05de80b48586 100644 --- a/kernel/sched/cputime.c +++ b/kernel/sched/cputime.c @@ -788,6 +788,9 @@ cputime_t task_gtime(struct task_struct *t) unsigned int seq; cputime_t gtime; + if (!context_tracking_is_enabled()) + return t->gtime; + do { seq = read_seqbegin(&t->vtime_seqlock); |