From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 11664C5DF60 for ; Fri, 8 Nov 2019 19:22:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D38A620656 for ; Fri, 8 Nov 2019 19:22:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573240974; bh=+3VcyUp/A4wUfZUTyKpsRPmiL8cfFBaBUdLzuwzK3r0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Xhn83iJ4ffw/jKnfS8zjiG7TAMgXpfokAD83HXKl7NinNRqTzgQqbaToFNgInsR53 ZFSmf/EP7P3CZceEj1lVockH7KngaD+fTse7NZdg96VA8mzCpLbLoynHvFFmqxA0Cd 74SNhAplkXIns4YmwAFqhHXwN4JnPEVMashkuHFM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387531AbfKHSza (ORCPT ); Fri, 8 Nov 2019 13:55:30 -0500 Received: from mail.kernel.org ([198.145.29.99]:52706 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387504AbfKHSz3 (ORCPT ); Fri, 8 Nov 2019 13:55:29 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4B91120865; Fri, 8 Nov 2019 18:55:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573239321; bh=+3VcyUp/A4wUfZUTyKpsRPmiL8cfFBaBUdLzuwzK3r0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hLwWwbLYp6Sr/3M/NwfJ+0f01aa785aMArt7q0NC7n8GcSrYasKQzLKPWnC5h2yd1 66pPxyNJ65N8Xs+zBF7oYyUzm3eX2K5p83h5zKQO/sipuyUPeDjn++NfD/TbALU+5I M1cO/Hrysj+2dogTj1/V3iCnHUHp919xsFFvDzeQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg Kroah-Hartman , Petr Vorel , Thadeu Lima de Souza Cascardo Subject: [PATCH 4.4 74/75] alarmtimer: Change remaining ENOTSUPP to EOPNOTSUPP Date: Fri, 8 Nov 2019 19:50:31 +0100 Message-Id: <20191108174813.354911623@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191108174708.135680837@linuxfoundation.org> References: <20191108174708.135680837@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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: c22df8ea7c5831d6fdca2f6f136f0d32d7064ff9 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 @@ -573,7 +573,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; @@ -597,7 +597,7 @@ static int alarm_timer_set(struct k_itim ktime_t exp; if (!rtcdev) - return -ENOTSUPP; + return -EOPNOTSUPP; if (flags & ~TIMER_ABSTIME) return -EINVAL;