From nobody Mon May 23 10:20:17 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 7BC331B3958F; Mon, 23 May 2022 10:20:18 +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 4L6CyB1Yrwz3FlF; Mon, 23 May 2022 10:20:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653301218; 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=ftTuHfklBt2Q7ujdpXcdnToD8T+IGSQtyuemqv9xOD0=; b=go2qdsUNKK9FnIdmtQYJZq6ylhkiz0b6RDAlVdbbOe8+zQ7SnoYSIOBCTXPkqvY5RGr37r Dw+CKFg0XR9UOfTZpfIoRgaL45vJsCUl4kjX2QOoQWnvzDQ5cb8CwhIAArW33n3wcst/Ya +yepn6q4gP1FOAhSyW3Cf5KJ6RScAkTQosUdowYBJTA4PeMJFD5A388aWwtPsLIpzF9cyd hq8XVfcpe7nEL9B6FEiZzdGCVywkcGvzFlzgrcBrsuHzjCf518Wi/EExxGA4oS0QBhQDTy FYw/GWysC+K1JxBG9pqfsAS70cjJfgLBnMrBXpetn23RSKS/gUPzxC9+JCt7wg== 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 E33DC5D33; Mon, 23 May 2022 10:20:17 +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 24NAKHmY030608; Mon, 23 May 2022 10:20:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24NAKH90030601; Mon, 23 May 2022 10:20:17 GMT (envelope-from git) Date: Mon, 23 May 2022 10:20:17 GMT Message-Id: <202205231020.24NAKH90030601@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 2b378d59a98a - main - linux(4); Move vdso_selector_x86.c to the linux_common module 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2b378d59a98a4eb1dab173c4db3b48f385c47728 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653301218; 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=ftTuHfklBt2Q7ujdpXcdnToD8T+IGSQtyuemqv9xOD0=; b=qFi5t4CsAoZDH0RqDRVMUbPx1gCcSfYXQuXYP9ZNSKKLlkhp/mz98TEBWa4GEUoqDtteLD b/m0RDxa8NzNZFRT4ghA3v4dqlZeuBZMTFBfy5lj42x53m6q3DMXrxE0NATLN4b+ZJLiiJ LRjMWCecWYkktoyThSOvCNJf1MF6mHq9SKY6LPrIyd6EVHzVjMx3TGtnFMdGpUfKVKPYR+ oB7YoYjXBOMor6ekgvQR/W75MOqtgySKLoZr29uiiu1GCVLgDBLlS1n7hTlnpp3qo2IfX/ bzfmq2U+KfSlDEuuPctt77+H5absVCe7Yjm0pDn+wHGz/oakmiNYnJoy7Daedg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653301218; a=rsa-sha256; cv=none; b=USZYCTlXw+5TZU0crcrzKADBwsakPiQGPRV16Et2hysH7NVB88p6euMsPgaYN3Ln+Wx8dm yKR2tAKQZQBZb64WSWh/rYU4uLxlb7kcpxKRNfH7lil72vT5KJkHRtEr9KjnDHSCviz4rt lz3AekSG4cFo7UCI71V7xg/e8+lzSVxeZoc6pmlsRz1PrS4ZBBl6Jl5CyMi/hmTTHDYVmL fEVRNphrfdLRRG1UV5i7fDGupt94+7AhvRYZ6ZDphrtn2nD/lby5kpGRddqu4nm4kqg6SK Jfwx37bEV+1nZMz0E4sWqRy7qPxS9laA50JPr6TrevV/UzWa9zlHZIMJu2ieYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=2b378d59a98a4eb1dab173c4db3b48f385c47728 commit 2b378d59a98a4eb1dab173c4db3b48f385c47728 Author: Dmitry Chagin AuthorDate: 2022-05-23 10:19:07 +0000 Commit: Dmitry Chagin CommitDate: 2022-05-23 10:19:07 +0000 linux(4); Move vdso_selector_x86.c to the linux_common module MFC after: 2 weeks --- sys/modules/linux/Makefile | 4 ++-- sys/modules/linux64/Makefile | 2 +- sys/modules/linux_common/Makefile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index be6231f767f1..46087dede53f 100644 --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -20,7 +20,7 @@ SRCS= linux_fork.c linux${SFX}_dummy_machdep.c linux_file.c linux_event.c \ opt_inet6.h opt_compat.h opt_posix.h opt_usb.h vnode_if.h \ device_if.h bus_if.h .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" -SRCS+= linux_dummy_x86.c linux_vdso_selector_x86.c +SRCS+= linux_dummy_x86.c VDSODEPS=linux_vdso_gettc_x86.inc .endif .if ${MACHINE_CPUARCH} == "amd64" @@ -42,7 +42,7 @@ OBJS= linux${SFX}_vdso.so .if ${MACHINE_CPUARCH} == "i386" SRCS+= linux_ptrace_machdep.c imgact_linux.c linux_util.c linux_mib.c \ linux_mmap.c linux_dummy.c linux_emul.c linux_errno.c opt_cpu.h linux.c \ - linux_x86.c + linux_x86.c linux_vdso_selector_x86.c .endif .if ${MACHINE_CPUARCH} == "i386" diff --git a/sys/modules/linux64/Makefile b/sys/modules/linux64/Makefile index 63ddad878399..fd1363679513 100644 --- a/sys/modules/linux64/Makefile +++ b/sys/modules/linux64/Makefile @@ -15,7 +15,7 @@ SRCS= linux_elf64.c linux_fork.c linux_dummy_machdep.c linux_file.c \ vnode_if.h device_if.h bus_if.h \ linux_support.s .if ${MACHINE_CPUARCH} == "amd64" -SRCS+= linux_dummy_x86.c linux_vdso_selector_x86.c +SRCS+= linux_dummy_x86.c .endif DPSRCS= assym.inc linux_genassym.c diff --git a/sys/modules/linux_common/Makefile b/sys/modules/linux_common/Makefile index 033fabe27188..0c4983ef98ca 100644 --- a/sys/modules/linux_common/Makefile +++ b/sys/modules/linux_common/Makefile @@ -8,7 +8,7 @@ SRCS= linux_common.c linux_mib.c linux_mmap.c linux_util.c linux_emul.c \ linux.c device_if.h vnode_if.h bus_if.h opt_inet6.h .if ${MACHINE_CPUARCH} == "amd64" -SRCS+= linux_x86.c +SRCS+= linux_x86.c linux_vdso_selector_x86.c .endif EXPORT_SYMS=