From patchwork Thu Jun 17 11:50:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 43871 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 560813898509 for ; Thu, 17 Jun 2021 12:00:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 560813898509 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1623931228; bh=sRQTS9GPtihbR/Wnnx/q7OSW8O7UVHSdUS51p/OE7e4=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=PJ9lWFZmBJMX5gqGiUznc4FB2/3eDNBR2f9OoAUC1DixW/ojUpv5e2iHxFReK9i5H Bmcg4sjlde9nAUDz6J3JwyAr/PUMocqiUJnwwc6ddgZme6wwEz01UjWyQwtWNxBVPC baQvxmm4qM5vsBWiNT75ljbzyVrONsQ3sjvZoUpI= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qv1-xf31.google.com (mail-qv1-xf31.google.com [IPv6:2607:f8b0:4864:20::f31]) by sourceware.org (Postfix) with ESMTPS id 8C1453893670 for ; Thu, 17 Jun 2021 11:51:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8C1453893670 Received: by mail-qv1-xf31.google.com with SMTP id c10so1458082qvo.9 for ; Thu, 17 Jun 2021 04:51:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sRQTS9GPtihbR/Wnnx/q7OSW8O7UVHSdUS51p/OE7e4=; b=DKgEofs8qSj1YG3pk7JS+gksrKJPkKoMAS5NtZlTDPxtVrAE/116R5fC5TdZsAz3JA R/OQp7aup0ahoKxwuD2kc7n80TyleaA7qRlgRFluitv+55O5gHgbPPjwBjanQizHfSzR NCsQyTNYff1qHdJRaLj79QqNbET2G1mWBN3+zB5QaZ6NIItL+uBaVDuBEQVvLkJ8kKoX w7Xm7o+wJ4Bgv6YamZF4CdrC8iDCVjmCI2s8L7w5OXHtPg5GpUWYsJYmQ5zR5UpBxDUK +b8mSgS15Maqd4dDqEPcLqJwwvBJlOO7ogZ9EY0ZECrmGLg6UvVs163gr5FbYDg/xedc 1Onw== X-Gm-Message-State: AOAM533NtmvNivzT5zkNw2uR2OzG+Bhgtw/FlUETYZWT55IkrlSbIZ/c D4d5Cc2a8REdJDFGpLKm+GCz9b1qGxo28A== X-Google-Smtp-Source: ABdhPJwvhecQBzR3ou6kzVudyM30TF5zAdQD9pZv8eusW3reof7vGphDlI+gHFrL0zoKsbplFd0ATw== X-Received: by 2002:a05:6214:321:: with SMTP id j1mr5654457qvu.38.1623930686061; Thu, 17 Jun 2021 04:51:26 -0700 (PDT) Received: from birita.. ([177.194.59.218]) by smtp.googlemail.com with ESMTPSA id p12sm3016435qtw.61.2021.06.17.04.51.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jun 2021 04:51:25 -0700 (PDT) To: libc-alpha@sourceware.org, Lukasz Majewski , Carlos O'Donell Subject: [PATCH 10/18] linux: timerfd_gettime minor cleanup Date: Thu, 17 Jun 2021 08:50:56 -0300 Message-Id: <20210617115104.1359598-11-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210617115104.1359598-1-adhemerval.zanella@linaro.org> References: <20210617115104.1359598-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" The __NR_timerfd_gettime64 is always defined. Reviewed-by: Lukasz Majewski --- sysdeps/unix/sysv/linux/timerfd_gettime.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sysdeps/unix/sysv/linux/timerfd_gettime.c b/sysdeps/unix/sysv/linux/timerfd_gettime.c index 89f8066b91..5f668257c4 100644 --- a/sysdeps/unix/sysv/linux/timerfd_gettime.c +++ b/sysdeps/unix/sysv/linux/timerfd_gettime.c @@ -25,17 +25,17 @@ int __timerfd_gettime64 (int fd, struct __itimerspec64 *value) { +#ifndef __NR_timerfd_gettime64 +# define __NR_timerfd_gettime64 __NR_timerfd_gettime +#endif + #ifdef __ASSUME_TIME64_SYSCALLS -# ifndef __NR_timerfd_gettime64 -# define __NR_timerfd_gettime64 __NR_timerfd_gettime -# endif return INLINE_SYSCALL_CALL (timerfd_gettime64, fd, value); #else -# ifdef __NR_timerfd_gettime64 int ret = INLINE_SYSCALL_CALL (timerfd_gettime64, fd, value); if (ret == 0 || errno != ENOSYS) return ret; -# endif + struct itimerspec its32; int retval = INLINE_SYSCALL_CALL (timerfd_gettime, fd, &its32); if (retval == 0)