Linux kernel -stable discussions
 help / color / mirror / Atom feed
* [PATCH v4.4-stable] alarmtimer: Change remaining ENOTSUPP to EOPNOTSUPP
@ 2019-11-08 15:51 Petr Vorel
  2019-11-08 16:58 ` Thadeu Lima de Souza Cascardo
  0 siblings, 1 reply; 2+ messages in thread
From: Petr Vorel @ 2019-11-08 15:51 UTC (permalink / raw)
  To: stable; +Cc: Petr Vorel, Thadeu Lima de Souza Cascardo

Fix backport of commit f18ddc13af981ce3c7b7f26925f099e7c6929aba upstream.

Update backport to change ENOTSUPP to EOPNOTSUPP in
alarm_timer_{del,set}(), which were removed in
f2c45807d3992fe0f173f34af9c347d907c31686 in v4.13-rc1.

Fixes: c22df8ea7c5831d6fdca2f6f136f0d32d7064ff9

Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
 kernel/time/alarmtimer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
index 70aef327b6e8..015d432bcb08 100644
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
@@ -573,7 +573,7 @@ static void alarm_timer_get(struct k_itimer *timr,
 static int alarm_timer_del(struct k_itimer *timr)
 {
 	if (!rtcdev)
-		return -ENOTSUPP;
+		return -EOPNOTSUPP;
 
 	if (alarm_try_to_cancel(&timr->it.alarm.alarmtimer) < 0)
 		return TIMER_RETRY;
@@ -597,7 +597,7 @@ static int alarm_timer_set(struct k_itimer *timr, int flags,
 	ktime_t exp;
 
 	if (!rtcdev)
-		return -ENOTSUPP;
+		return -EOPNOTSUPP;
 
 	if (flags & ~TIMER_ABSTIME)
 		return -EINVAL;
-- 
2.16.4


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH v4.4-stable] alarmtimer: Change remaining ENOTSUPP to EOPNOTSUPP
  2019-11-08 15:51 [PATCH v4.4-stable] alarmtimer: Change remaining ENOTSUPP to EOPNOTSUPP Petr Vorel
@ 2019-11-08 16:58 ` Thadeu Lima de Souza Cascardo
  0 siblings, 0 replies; 2+ messages in thread
From: Thadeu Lima de Souza Cascardo @ 2019-11-08 16:58 UTC (permalink / raw)
  To: Petr Vorel; +Cc: stable

On Fri, Nov 08, 2019 at 04:51:16PM +0100, Petr Vorel wrote:
> Fix backport of commit f18ddc13af981ce3c7b7f26925f099e7c6929aba upstream.
> 
> Update backport to change ENOTSUPP to EOPNOTSUPP in
> alarm_timer_{del,set}(), which were removed in
> f2c45807d3992fe0f173f34af9c347d907c31686 in v4.13-rc1.
> 
> Fixes: c22df8ea7c5831d6fdca2f6f136f0d32d7064ff9
> 
> Signed-off-by: Petr Vorel <pvorel@suse.cz>


Acked-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>

> ---
>  kernel/time/alarmtimer.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
> index 70aef327b6e8..015d432bcb08 100644
> --- a/kernel/time/alarmtimer.c
> +++ b/kernel/time/alarmtimer.c
> @@ -573,7 +573,7 @@ static void alarm_timer_get(struct k_itimer *timr,
>  static int alarm_timer_del(struct k_itimer *timr)
>  {
>  	if (!rtcdev)
> -		return -ENOTSUPP;
> +		return -EOPNOTSUPP;
>  
>  	if (alarm_try_to_cancel(&timr->it.alarm.alarmtimer) < 0)
>  		return TIMER_RETRY;
> @@ -597,7 +597,7 @@ static int alarm_timer_set(struct k_itimer *timr, int flags,
>  	ktime_t exp;
>  
>  	if (!rtcdev)
> -		return -ENOTSUPP;
> +		return -EOPNOTSUPP;
>  
>  	if (flags & ~TIMER_ABSTIME)
>  		return -EINVAL;
> -- 
> 2.16.4
> 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-11-08 16:58 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-08 15:51 [PATCH v4.4-stable] alarmtimer: Change remaining ENOTSUPP to EOPNOTSUPP Petr Vorel
2019-11-08 16:58 ` Thadeu Lima de Souza Cascardo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox