diff options
| author | Bjorn Andersson <bjorn.andersson@linaro.org> | 2018-05-09 12:00:19 -0700 |
|---|---|---|
| committer | Bjorn Andersson <bjorn.andersson@linaro.org> | 2018-05-09 12:00:19 -0700 |
| commit | cc1c8445eba5b78f5b719c47572473d7a7caa038 (patch) | |
| tree | 3954bcaa641ee362bf06b7aa9197d30a90eb4ca3 /kernel/time/posix-stubs.c | |
| parent | ab460a2e72dabecfdabd45eb7e3ee2d73fc876d4 (diff) | |
| parent | 75bc37fefc4471e718ba8e651aa74673d4e0a9eb (diff) | |
| download | linux-rt-cc1c8445eba5b78f5b719c47572473d7a7caa038.tar.gz | |
Merge tag 'v4.17-rc4' into rpmsg-next
Pick up fixes from rproc-v4.17-1
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Diffstat (limited to 'kernel/time/posix-stubs.c')
| -rw-r--r-- | kernel/time/posix-stubs.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/time/posix-stubs.c b/kernel/time/posix-stubs.c index e0dbae98db9d..69a937c3cd81 100644 --- a/kernel/time/posix-stubs.c +++ b/kernel/time/posix-stubs.c @@ -83,8 +83,6 @@ int do_clock_gettime(clockid_t which_clock, struct timespec64 *tp) case CLOCK_BOOTTIME: get_monotonic_boottime64(tp); break; - case CLOCK_MONOTONIC_ACTIVE: - ktime_get_active_ts64(tp); default: return -EINVAL; } |