Merge branch 'timers/urgent' into timers/core

Pick up urgent fixes to apply dependent cleanup patch
2018-05-02 16:11:12 +02:00
parent 1cfd904f16 7dba33c634
commit 604a98f1df
674 changed files with 8481 additions and 4801 deletions
--- 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;
 	}