Commit 16208cd6 authored Sep 17, 2019 by Linus Torvalds

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer fix from Thomas Gleixner:
 "A single fix to prevent the alarm timer code from returning ENOTSUPP
  to user space.

  ENOTSUPP is a purely kernel internal error code related to NFSv3 and
  should never be handed back to user space. The risk for ABI breakage
  is low as the number of systems which do not have a working RTC is
  very limited"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  alarmtimer: Use EOPNOTSUPP instead of ENOTSUPP

parents ad062195 f18ddc13

kernel/time/alarmtimer.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -672,7 +672,7 @@ static int alarm_timer_create(struct k_itimer *new_timer)
		enum alarmtimer_type type;

		if (!alarmtimer_get_rtcdev())
		return -ENOTSUPP;
		return -EOPNOTSUPP;

		if (!capable(CAP_WAKE_ALARM))
		return -EPERM;
		@@ -790,7 +790,7 @@ static int alarm_timer_nsleep(const clockid_t which_clock, int flags,
		int ret = 0;

		if (!alarmtimer_get_rtcdev())
		return -ENOTSUPP;
		return -EOPNOTSUPP;

		if (flags & ~TIMER_ABSTIME)
		return -EINVAL;

Admin message