* [PATCH v4.9-stable] alarmtimer: Change remaining ENOTSUPP to EOPNOTSUPP
@ 2019-11-08 15:50 Petr Vorel
2019-11-08 16:58 ` Thadeu Lima de Souza Cascardo
2019-11-08 17:34 ` Greg KH
0 siblings, 2 replies; 3+ messages in thread
From: Petr Vorel @ 2019-11-08 15:50 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: 65b7a5a36afb11a6769a70308c1ef3a2afae6bf4
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 a519d3cab1a2..6aef4a0bed29 100644
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
@@ -586,7 +586,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;
@@ -610,7 +610,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] 3+ messages in thread
* Re: [PATCH v4.9-stable] alarmtimer: Change remaining ENOTSUPP to EOPNOTSUPP
2019-11-08 15:50 [PATCH v4.9-stable] alarmtimer: Change remaining ENOTSUPP to EOPNOTSUPP Petr Vorel
@ 2019-11-08 16:58 ` Thadeu Lima de Souza Cascardo
2019-11-08 17:34 ` Greg KH
1 sibling, 0 replies; 3+ 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:50:50PM +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: 65b7a5a36afb11a6769a70308c1ef3a2afae6bf4
>
> Signed-off-by: Petr Vorel <pvorel@suse.cz>
Nice catch!
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 a519d3cab1a2..6aef4a0bed29 100644
> --- a/kernel/time/alarmtimer.c
> +++ b/kernel/time/alarmtimer.c
> @@ -586,7 +586,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;
> @@ -610,7 +610,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] 3+ messages in thread
* Re: [PATCH v4.9-stable] alarmtimer: Change remaining ENOTSUPP to EOPNOTSUPP
2019-11-08 15:50 [PATCH v4.9-stable] alarmtimer: Change remaining ENOTSUPP to EOPNOTSUPP Petr Vorel
2019-11-08 16:58 ` Thadeu Lima de Souza Cascardo
@ 2019-11-08 17:34 ` Greg KH
1 sibling, 0 replies; 3+ messages in thread
From: Greg KH @ 2019-11-08 17:34 UTC (permalink / raw)
To: Petr Vorel; +Cc: stable, Thadeu Lima de Souza Cascardo
On Fri, Nov 08, 2019 at 04:50:50PM +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: 65b7a5a36afb11a6769a70308c1ef3a2afae6bf4
>
> Signed-off-by: Petr Vorel <pvorel@suse.cz>
> ---
> kernel/time/alarmtimer.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
Thanks for both backports, now queued up.
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-11-08 17:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-08 15:50 [PATCH v4.9-stable] alarmtimer: Change remaining ENOTSUPP to EOPNOTSUPP Petr Vorel
2019-11-08 16:58 ` Thadeu Lima de Souza Cascardo
2019-11-08 17:34 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).