From nobody Fri Jul 28 08:55:48 2023 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 4RC1gm5zLfz4pTFr; Fri, 28 Jul 2023 08:55:48 +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 4RC1gm5JVQz3jCs; Fri, 28 Jul 2023 08:55:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690534548; 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=ZBwd/tx76bxU8nRruhjA0Ly2KqBaamdLkhCl+ZZ2h00=; b=eDPQSiJHZIKBHurG8urmXV4OoCbiIjCABrD2PdJrsLAeIfRBa83zYifWipa9UL3lv89LV+ HriHmDJTDYxkPEs1GTzb1rqzCs5ArqkTRvHgp97rZuXTORsFVSdZROwScIFQRq9UEfXGUV ESvCe+hqQNpKd3FB3iQJgCrm+SHQaQmhtSEYRVK0DZmBn0DVh9LZb/6SepCePBkGsFAGvM LXyOq9LomeVjwLnNsE8T0XDI2/34tjzqiUSCB+02pSHyOYvb4xz7aAtMsotdZnrTC3iyy1 3uGGpWq/fG7GUPf+NDRjghsRlTmVPVnwfMeGOyCFXDtB0qkMEzLMkwJgiitn9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690534548; 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=ZBwd/tx76bxU8nRruhjA0Ly2KqBaamdLkhCl+ZZ2h00=; b=mdQsUsHFPKqMFHZWPGSEKqhxyRAdpLtpDLj3snwypcF8lAT9rsS67Y3T40NjNgBOY/h9c7 cRRcCxVkksb07hymqIJbXBLSHP199JIQye+zuQ06i84xo7Q9zCCY1kRuawcPqK7EIKhwvr PHF4a3aAi9IzXtx5lLikM5lyuddGLsL+dOaUk3KkgNTxGrQCu4Bg+xktI71ERi6JGmOlbf rg2M9DmCRrSyi6h2kqJsP5lwdkPY1A9tct0dJi8Jv5qkb0W1DU/DdEoG+O1qsJ3iFPGwxq J4DgPWJwHE2P084xlQdEixyhurNuZKBb3LojyBbJ5IAHJZu5Q3Q7y10dpqg+XA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690534548; a=rsa-sha256; cv=none; b=Ku3OnwbeRYCgarAFNt7zjrVYVawWvZU0ZWv7TdtRvSRSv2gWtd16ANKNKdkk5wh2/1W1S0 WEiw0IZ39qKsP33HA2t9J2X+ILlMr7IAoyZVhJyuuIPIgZAcub2eRadTEd8usjcpry5vs8 7F1MdKssOIJWo87mmqRWINXT7eYLa1fzT/R4YLgAKj7N4s8fWmj4h/tnqyqjmsmI0YyBMq wtTLaN+b9onlqad7wrQqNL7S3uFU6E3DZ7HvtA8mLolZSyNKNSQSPMLhRv0w5v30KnD+IL 7Q5f/no80WaoS0P1VpaM/2Xx0ctDd+b8wqSCXQzLEzlSYJ8eG6zkTwXyXNCcwQ== 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 4RC1gm4PgRzlYN; Fri, 28 Jul 2023 08:55:48 +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 36S8tm3p046097; Fri, 28 Jul 2023 08:55:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36S8tmGe046096; Fri, 28 Jul 2023 08:55:48 GMT (envelope-from git) Date: Fri, 28 Jul 2023 08:55:48 GMT Message-Id: <202307280855.36S8tmGe046096@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: 5440e7017a98 - main - i386: Don't use static DPCPU and VNET defines in i386 modules 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: 5440e7017a985276d4a46d482a76128e5b739f56 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=5440e7017a985276d4a46d482a76128e5b739f56 commit 5440e7017a985276d4a46d482a76128e5b739f56 Author: Dmitry Chagin AuthorDate: 2023-07-28 08:55:31 +0000 Commit: Dmitry Chagin CommitDate: 2023-07-28 08:55:31 +0000 i386: Don't use static DPCPU and VNET defines in i386 modules As of c84617e8 a similar to 4802a2cb and b6ea4c5a fix should be applied to i386 too. Reviewed by: Differential Revision: https://reviews.freebsd.org/D41195 --- sys/net/vnet.h | 2 +- sys/sys/pcpu.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/vnet.h b/sys/net/vnet.h index 7eb68ef7410f..0c40c9445aa1 100644 --- a/sys/net/vnet.h +++ b/sys/net/vnet.h @@ -281,7 +281,7 @@ extern struct sx vnet_sxlock; #define VNET_DEFINE(t, n) \ struct _hack; t VNET_NAME(n) __section(VNET_SETNAME) __used #if defined(KLD_MODULE) && (defined(__aarch64__) || defined(__riscv) \ - || defined(__powerpc64__)) + || defined(__powerpc64__) || defined(__i386__)) /* * As with DPCPU_DEFINE_STATIC we are unable to mark this data as static * in modules on some architectures. diff --git a/sys/sys/pcpu.h b/sys/sys/pcpu.h index 9ac4144d3267..070506ca8711 100644 --- a/sys/sys/pcpu.h +++ b/sys/sys/pcpu.h @@ -86,7 +86,7 @@ extern uintptr_t dpcpu_off[]; #define DPCPU_DEFINE(t, n) \ struct _hack; t DPCPU_NAME(n) __section(DPCPU_SETNAME) __used #if defined(KLD_MODULE) && (defined(__aarch64__) || defined(__riscv) \ - || defined(__powerpc64__)) + || defined(__powerpc64__) || defined(__i386__)) /* * On some architectures the compiler will use PC-relative load to * find the address of DPCPU data with the static keyword. We then