diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-09-21 09:14:51 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-09-21 09:14:51 -0700 |
| commit | 03ef042130c90fea1b458c020c4697cd20f4e3c4 (patch) | |
| tree | b4795c830272b45692b94364eaea43965824dd5e /arch/arm64/kernel | |
| parent | 1cea0d996effba78a75004b894a78b268f64a8a1 (diff) | |
| parent | d580248c6e00698b48ca35888ca9bad80e7997e8 (diff) | |
Merge "Merge android-4.4.155 (b3f777e) into msm-4.4"
Diffstat (limited to 'arch/arm64/kernel')
| -rw-r--r-- | arch/arm64/kernel/vdso.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c index 7e9dd94452bb..46fa4de29fb1 100644 --- a/arch/arm64/kernel/vdso.c +++ b/arch/arm64/kernel/vdso.c @@ -222,7 +222,6 @@ void update_vsyscall(struct timekeeper *tk) vdso_data->raw_time_nsec = tk->tkr_raw.xtime_nsec; vdso_data->xtime_clock_sec = tk->xtime_sec; vdso_data->xtime_clock_nsec = tk->tkr_mono.xtime_nsec; - /* tkr_raw.xtime_nsec == 0 */ vdso_data->cs_mono_mult = tk->tkr_mono.mult; vdso_data->cs_raw_mult = tk->tkr_raw.mult; /* tkr_mono.shift == tkr_raw.shift */ |