From nobody Wed Mar 06 17:29:27 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TqfYz2cSnz5CyrD; Wed, 6 Mar 2024 17:29:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TqfYz1Gxtz4pCd; Wed, 6 Mar 2024 17:29:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709746167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ze1TXtGjF8IGbNuP+awaCBssbRHeyb9ZzYceYWr/y5o=; b=U7YfYzVPu77dqki4SrT1c8vqNFDeh3gaoM7ymTbJ0ZsdsejqB+1am0lR3e9pD6KRs8ycdB 8+ZNkaXdyn+f25j7Y+/0NZrN3qBkwpQknxdKHVtnYcES8wtSLABujK9/5P8hbSLJ32AYwU 603maNNJpIL1RgHnhI5TiEGRdbrutVB+N9IY7ZNUtftEzBA8tuAjeLdUriE2WQts7Mlcd/ IfHsGvETuVBiEHa020mPe5Ubf5a9bMtkb+9OeUa414+AheChzvEaCdeo97IHGBYon0Cx40 qXy0AeLY0B2h4flKb1JDeLsA/GkzDN5Tq4jpdEt+6JhcW6Z5LpNdJL3wQIqAKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709746167; a=rsa-sha256; cv=none; b=vJXFJr0ytHhItoMVxPFY9FY4AM8f5aJ+JVSIG6aEZyDx/JrZncXfV0u5bLZ2qL8xuKZHOI cYn5C3rQFbpj+7lodvfaKnSq+UILxRY6ACtd1earFFRXhx30PRJ5VDJ9EYA6RdDejtSIQ0 6OA+9LBLeONTZksHT8q+wsqEKlQYWUN2vQ+FNpx9FMq2K3g9OPFQoCZt+dgUobWMyTtiJe iRjcYPt27xXuvKqMERD3BZ+CgQ3rzRT7zV+ApSMQ5aJi+fGMDkScvhAv0gLq90e/q6Z26S op96vU/zoAxuzWKuekge8ScwA4PSQALYO+cVugMqlZDb44klmeuVLrvlZyFkpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709746167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ze1TXtGjF8IGbNuP+awaCBssbRHeyb9ZzYceYWr/y5o=; b=n0l8hpa6aIXiQCN13QxsEpwI3A9JKS8wSL8vpzaMNwrDddXcsP4Lhdr1jSvjaHCrcNh08e ZZjw14STnFl+eGaegaBUiN4lDxZI/dyXnhdwXzL8Pda9oAsBrcKpgHnWJXea/1+BQcO0+/ K5xZ1NIUtHgJaHZsFx3mkdOq6OulBmea+8apq9FMl6wHiYDRCngNkyeXtfsG97+YUSvAuq NwmxUWWNOut8dO0yRWjJcgPofvGaFjiezDfOfH+YjV6TFD/afAnUcm/HKI96Hlk+SxT4BE XGDDRk7C9S4P3mk/LfTnZF984mGyCuSYp6y88xd8OvP9rgnfXlnnCRSMed/Ekg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TqfYz0tFtzynx; Wed, 6 Mar 2024 17:29:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 426HTRDC027494; Wed, 6 Mar 2024 17:29:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 426HTRUH027491; Wed, 6 Mar 2024 17:29:27 GMT (envelope-from git) Date: Wed, 6 Mar 2024 17:29:27 GMT Message-Id: <202403061729.426HTRUH027491@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 0ecf0b26a750 - main - timerfd_create: fix after cf742faa39a58a9b43b671c66097e6880459d4ae List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ecf0b26a750582b804e238e6446db55188d7fdc Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=0ecf0b26a750582b804e238e6446db55188d7fdc commit 0ecf0b26a750582b804e238e6446db55188d7fdc Author: Baptiste Daroussin AuthorDate: 2024-03-06 17:28:02 +0000 Commit: Baptiste Daroussin CommitDate: 2024-03-06 17:28:02 +0000 timerfd_create: fix after cf742faa39a58a9b43b671c66097e6880459d4ae Remove the include that crept in by accident Clang complains about CLOCK_BOOTTIME being the same for now as CLOCK_UPTIME, so remove CLOCK_BOOTTIME and leave a comment for what to do when CLOCK_BOOTTIME will be different for real. --- sys/kern/sys_timerfd.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/kern/sys_timerfd.c b/sys/kern/sys_timerfd.c index f74fb87bea75..8ac5b845f7ac 100644 --- a/sys/kern/sys_timerfd.c +++ b/sys/kern/sys_timerfd.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include @@ -439,8 +438,10 @@ kern_timerfd_create(struct thread *td, int clockid, int flags) case CLOCK_MONOTONIC: /* FALLTHROUGH */ case CLOCK_UPTIME: - /* FALLTHROUGH */ - case CLOCK_BOOTTIME: + /* + * CLOCK_BOOTTIME should be added once different from + * CLOCK_UPTIME + */ break; default: return (EINVAL);