From nobody Fri Jun 17 19:41:01 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 A336485D5FB; Fri, 17 Jun 2022 19:41:03 +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 4LPqCf5VkYz3hvl; Fri, 17 Jun 2022 19:41:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494862; 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=PXwpl//0cYiRHSyfgvSfCieiBsTvnWZLqA93/prxStc=; b=frhKN4I/lsKx7GhWQmSBtfy/UWpEDPN+nwzaSF+ZexWLM2zuI5OC1/gnJThEfazaTsgIr9 gbc7VMTV4ROsVeVZJV3NKHEnZvaD+vIi/DSCIY9n6ki0enN+88ULPM+CPZN5jnP7827+OY hz7PwgOlb025e5ck227o68JEaGM0/2q7+azuMf++RfLD6T5rejsULkxcj2XDOW4Hy+0dNu MgJAtvfMMEIiUdvJA80zTtAQPHXYjRoWC8V3v4abokPfi9hMmxjpmyMfQ+qJHfKhJU3SmH tMXKCa2a5hq6zRjvd30RGI7u+PqXwD6h65mvBnXrwkFXdaskMlL0joA9NLbIRw== 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 EAD9425A60; Fri, 17 Jun 2022 19:41:01 +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 25HJf1JY029930; Fri, 17 Jun 2022 19:41:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJf1Q7029929; Fri, 17 Jun 2022 19:41:01 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:41:01 GMT Message-Id: <202206171941.25HJf1Q7029929@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: fa085e417d01 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: fa085e417d0131a8a6a41af2a9ab77f6860a12c5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494862; 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=PXwpl//0cYiRHSyfgvSfCieiBsTvnWZLqA93/prxStc=; b=nKfhOCTYoTAvnXtX/y48z+YIjArDdZWz8Huh+k0YWBftpNwC8hlFCiv1eUA2ZyXULD3WIG qEk5YxH/5gi4lBVQwoMewk3NtHfyt+IFXFrk708a8geeHzLEZzCEnps6qvb5iA+Sg1B5C0 E/Jdm8cQavrDr2Ky0GH7MW7MDDkUbqxcHRnbzlSwqyeZgOl2ZMOJudYQNaLN9muux9sBQG Vr6uvxBDJfSBHQB1EmXVsr5jYbFlfDKQkrFmJbBPMH7R9Q4SuUA1swmx4amlamWvTuWaJ1 5TinsMcr7bJJyoRpczfGkaR1CAFd/Oe3j1wjZE6zPeVjIb+FKvAfmxX6aVuhpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494862; a=rsa-sha256; cv=none; b=s4SFoXiQogjjh4HhPcoDOKWXm7d6aKuqobMB48aRuqAeIbejEclm1BvFZtR6B/crHKEY7J eU/6d3LYTUS5TZTeKfAY69IoRbdE6Op6JttWBktwqiHypMWPXPdpa4EUYBl7VLk0PgOf62 J+fVwZnAXvLeiNGYSKxaZ7XLQzq02VjwRV4OAacicJDNadYJAbTtYyu1HOn7+pUrRhLtgW igPF1e2KPylqT79rpZD6ZfcKWK30rdJhDdZeCMizKhwKQwtw/MQqcbq1lDi0YVJ70wnu8D OrJHcSkjbhyR3ZWsAT7G3XuQYigqOzxQ5vmI37VjfEz5zWNsWUo2OTSrfPtZbA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=fa085e417d0131a8a6a41af2a9ab77f6860a12c5 commit fa085e417d0131a8a6a41af2a9ab77f6860a12c5 Author: Dmitry Chagin AuthorDate: 2022-05-23 10:19:07 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:35:30 +0000 linux(4); Move vdso_selector_x86.c to the linux_common module MFC after: 2 weeks (cherry picked from commit 2b378d59a98a4eb1dab173c4db3b48f385c47728) --- 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=