diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-05-21 08:45:44 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-05-21 08:45:43 -0700 |
| commit | 3d8551da605ea8bbdb5ffcc838409db04124ed2b (patch) | |
| tree | 677bc11a6da70dc5001beb7215e2d0cf80770928 /arch | |
| parent | 1ff291a124bd33683f1cf8eb99fdbf6064062050 (diff) | |
| parent | e30cb51ecc33847cd0605ce5f069507f55f83436 (diff) | |
Merge "arm64/vdso: Fix nsec handling for CLOCK_MONOTONIC_RAW"
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/kernel/vdso/gettimeofday.S | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm64/kernel/vdso/gettimeofday.S b/arch/arm64/kernel/vdso/gettimeofday.S index c97ce91cf023..c39872a7b03c 100644 --- a/arch/arm64/kernel/vdso/gettimeofday.S +++ b/arch/arm64/kernel/vdso/gettimeofday.S @@ -256,7 +256,6 @@ monotonic_raw: seqcnt_check fail=monotonic_raw /* All computations are done with left-shifted nsecs. */ - lsl x14, x14, x12 get_nsec_per_sec res=x9 lsl x9, x9, x12 |