From nobody Thu Feb 17 12:54:29 2022 X-Original-To: dev-commits-src-all@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 24B4F19CA834; Thu, 17 Feb 2022 12:54:30 +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 4Jzvsy0Z7xz3FTh; Thu, 17 Feb 2022 12:54:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645102470; 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=WXmEaVgnf7oHdQRz3OthqfOxQaP3kd2SphWyQNs/yOM=; b=hd5wV4oWd0/B/6P+TBIoTGdn6fJjUU7UPhQKu5OlkbE1AgB6W1OWBunrHAZENxPG59FlEI zYS2r42JZ+jjG/ApYM+4ySWp99ycrWylPmAreQYTpQUQ3LHzFjyEBdK2jINljnyKKKyJ9i bQB5BNri8TuXja0fWti9CL2z47bSgKO2NuEduMmegcMrkZUyDyUsvzg8ACJzw3KGRJkO2Z urDtWF4EJsuHrBiWEsAzUONLY+u7KBS2vxxbzhAEAeWC8g4NL0EvAv/0l2/oze96Sb4Gwi eOO5dT8zpYValwCbe1AVqzi0igQHpKEydtK7L9ApHDKgPFwwEzZmZlWcyYtCCA== 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 E7947213D; Thu, 17 Feb 2022 12:54:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21HCsTTR080253; Thu, 17 Feb 2022 12:54:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21HCsT7J080252; Thu, 17 Feb 2022 12:54:29 GMT (envelope-from git) Date: Thu, 17 Feb 2022 12:54:29 GMT Message-Id: <202202171254.21HCsT7J080252@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Edward Tomasz Napierala Subject: git: cbab32bdf15d - stable/13 - linux: deduplicate DUMMY() entries List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: trasz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cbab32bdf15de14c24eaeb38fd757547733c2094 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645102470; 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=WXmEaVgnf7oHdQRz3OthqfOxQaP3kd2SphWyQNs/yOM=; b=reYXO9fS/558Dyu6YGtD1SsFPODgHzzdyuSia/iXdAAQTEaRDGdoslp7Wu5yQCdWUWf/2f 2mBXViUbOJOsfPoEerQGzxh5XWBclY/mmtTzjhrUYtnbwqo1yfI9RA8lF9OxqySW/J57Eh l5dkz4fZuyaF+NqdbHrf+PhrQHtNyJhIQzzp13Z8VvSiTbbrppSMcMyRZqs1uq1WKpAI7M YMEO+iHL3s9QnhMc73lCjxMVqx9lSkS42tnq6y5qam2k8qMr1KKNg0OUyo50Xp1POlZ2Hy qnED393uEaGLzAM6PF/j5cGbYa8CEqARgdhK9nsYps6Ns/aMHowSX9GHfkbm9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645102470; a=rsa-sha256; cv=none; b=uo5C4+EAjW2+iEfMo8jA6YQ9aGdXwB9fDUaxo1gW6S3Z9TgZ5HTM3ZEypZNcxuSdtlWTb3 Pzhkw+POVixImJym58emR+MCUiq7AKrUGxKjThjrdOJ6U/+TtW48Z97R8kQpK3Bn76Sqan u5Q6PgR31b1xD0tjd1w0xXc/YHhcVqiuusvvBQRnL8Nn23haKc/povOimKz+/htovvMbdI o2/V/JVpP2nh1GdjfHq4GDII9jOqlFXdl01/kEEXsYanll/UX+VAZNFXIZbr6vyJsVg9md 88DFZKn2H+ANiklpdf7KLGCHe9aLmsEGm9DbFOmPMc1iGdVNxTa3ZhHa3GqQcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by trasz: URL: https://cgit.FreeBSD.org/src/commit/?id=cbab32bdf15de14c24eaeb38fd757547733c2094 commit cbab32bdf15de14c24eaeb38fd757547733c2094 Author: Edward Tomasz Napierala AuthorDate: 2021-05-29 06:32:50 +0000 Commit: Edward Tomasz Napierala CommitDate: 2022-02-13 22:22:11 +0000 linux: deduplicate DUMMY() entries No functional changes. Reviewed By: emaste Sponsored By: EPSRC Differential Revision: https://reviews.freebsd.org/D30524 (cherry picked from commit 83043a741d114d7fd4a018e9c70330036ae44f81) --- sys/arm64/linux/linux_dummy_machdep.c | 7 ------- sys/compat/linux/linux_dummy.c | 10 ++++++++++ sys/x86/linux/linux_dummy_x86.c | 10 ---------- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/sys/arm64/linux/linux_dummy_machdep.c b/sys/arm64/linux/linux_dummy_machdep.c index 47b6ac093cb1..4bd339de4af5 100644 --- a/sys/arm64/linux/linux_dummy_machdep.c +++ b/sys/arm64/linux/linux_dummy_machdep.c @@ -61,11 +61,4 @@ DUMMY(mq_timedreceive); DUMMY(mq_notify); DUMMY(mq_getsetattr); DUMMY(semtimedop); -DUMMY(statx); -DUMMY(io_pgetevents); DUMMY(kexec_file_load); -DUMMY(rseq); -DUMMY(pidfd_send_signal); -DUMMY(io_uring_setup); -DUMMY(io_uring_enter); -DUMMY(io_uring_register); diff --git a/sys/compat/linux/linux_dummy.c b/sys/compat/linux/linux_dummy.c index 5f174d0e4994..fef09809822b 100644 --- a/sys/compat/linux/linux_dummy.c +++ b/sys/compat/linux/linux_dummy.c @@ -147,6 +147,16 @@ DUMMY(faccessat2); DUMMY(process_madvise); DUMMY(epoll_pwait2); DUMMY(mount_setattr); +/* Linux 4.11: */ +DUMMY(statx); +/* Linux 4.18: */ +DUMMY(io_pgetevents); +DUMMY(rseq); +/* Linux 5.0: */ +DUMMY(pidfd_send_signal); +DUMMY(io_uring_setup); +DUMMY(io_uring_enter); +DUMMY(io_uring_register); #define DUMMY_XATTR(s) \ int \ diff --git a/sys/x86/linux/linux_dummy_x86.c b/sys/x86/linux/linux_dummy_x86.c index 1defe4e9674e..d6a1ce38da48 100644 --- a/sys/x86/linux/linux_dummy_x86.c +++ b/sys/x86/linux/linux_dummy_x86.c @@ -57,13 +57,3 @@ DUMMY(quotactl); DUMMY(inotify_init); /* Linux 2.6.22: */ DUMMY(signalfd); -/* Linux 4.11: */ -DUMMY(statx); -/* Linux 4.18: */ -DUMMY(io_pgetevents); -DUMMY(rseq); -/* Linux 5.0: */ -DUMMY(pidfd_send_signal); -DUMMY(io_uring_setup); -DUMMY(io_uring_enter); -DUMMY(io_uring_register);