diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-01-29 07:35:19 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-01-29 07:35:19 +0100 |
| commit | a31886669f6277a8576af6e917c3958c780a4ebf (patch) | |
| tree | 195338489a866f54af718a67122150bd78c5cc42 /kernel/time/sched_clock.c | |
| parent | e7729a415315fcd9516912050d85d5aaebcededc (diff) | |
| parent | e65523ca79fd087d9888598eadeb9554e2bd2102 (diff) | |
| download | linux-stable-a31886669f6277a8576af6e917c3958c780a4ebf.tar.gz linux-stable-a31886669f6277a8576af6e917c3958c780a4ebf.tar.bz2 linux-stable-a31886669f6277a8576af6e917c3958c780a4ebf.zip | |
Merge tag 'asoc-v3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.14
A few fixes, all in drivers. Nothing stands out particularly, the
biggest set of fixes is some build coverage issues from Sachin.
Diffstat (limited to 'kernel/time/sched_clock.c')
| -rw-r--r-- | kernel/time/sched_clock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/time/sched_clock.c b/kernel/time/sched_clock.c index 68b799375981..0abb36464281 100644 --- a/kernel/time/sched_clock.c +++ b/kernel/time/sched_clock.c @@ -74,7 +74,7 @@ unsigned long long notrace sched_clock(void) return cd.epoch_ns; do { - seq = read_seqcount_begin(&cd.seq); + seq = raw_read_seqcount_begin(&cd.seq); epoch_cyc = cd.epoch_cyc; epoch_ns = cd.epoch_ns; } while (read_seqcount_retry(&cd.seq, seq)); @@ -99,10 +99,10 @@ static void notrace update_sched_clock(void) cd.mult, cd.shift); raw_local_irq_save(flags); - write_seqcount_begin(&cd.seq); + raw_write_seqcount_begin(&cd.seq); cd.epoch_ns = ns; cd.epoch_cyc = cyc; - write_seqcount_end(&cd.seq); + raw_write_seqcount_end(&cd.seq); raw_local_irq_restore(flags); } |