From: Greg Kroah-Hartman Date: Fri, 8 Nov 2019 17:38:36 +0000 (+0100) Subject: 4.9-stable patches X-Git-Tag: v4.4.200~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dbbc029f6352894fa1f07be01d8845a2ee7c8c98;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: alarmtimer-change-remaining-enotsupp-to-eopnotsupp.patch --- diff --git a/queue-4.9/alarmtimer-change-remaining-enotsupp-to-eopnotsupp.patch b/queue-4.9/alarmtimer-change-remaining-enotsupp-to-eopnotsupp.patch new file mode 100644 index 00000000000..599d1248a60 --- /dev/null +++ b/queue-4.9/alarmtimer-change-remaining-enotsupp-to-eopnotsupp.patch @@ -0,0 +1,45 @@ +From pvorel@suse.cz Fri Nov 8 18:33:13 2019 +From: Petr Vorel +Date: Fri, 8 Nov 2019 16:50:50 +0100 +Subject: alarmtimer: Change remaining ENOTSUPP to EOPNOTSUPP +To: stable@vger.kernel.org +Cc: Petr Vorel , Thadeu Lima de Souza Cascardo +Message-ID: <20191108155050.12786-1-pvorel@suse.cz> + +From: Petr Vorel + +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 +Acked-by: Thadeu Lima de Souza Cascardo +Signed-off-by: Greg Kroah-Hartman +--- + kernel/time/alarmtimer.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/kernel/time/alarmtimer.c ++++ b/kernel/time/alarmtimer.c +@@ -586,7 +586,7 @@ static void alarm_timer_get(struct k_iti + 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_itim + ktime_t exp; + + if (!rtcdev) +- return -ENOTSUPP; ++ return -EOPNOTSUPP; + + if (flags & ~TIMER_ABSTIME) + return -EINVAL; diff --git a/queue-4.9/series b/queue-4.9/series index 93a38259da6..d125bb7bbd0 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -31,3 +31,4 @@ kbuild-use-fmacro-prefix-map-to-make-__file__-a-rela.patch kbuild-add-fcf-protection-none-when-using-retpoline-.patch net-flow_dissector-switch-to-siphash.patch dmaengine-qcom-bam_dma-fix-resource-leak.patch +alarmtimer-change-remaining-enotsupp-to-eopnotsupp.patch