From nobody Thu Nov 09 14:40:30 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 4SR4PV4hNXz4ywFw; Thu, 9 Nov 2023 14:40: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 4SR4PV4Ck5z3Qrb; Thu, 9 Nov 2023 14:40:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699540830; 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=vEptvHbxibNocBLLvFD5YPzWgoodmLe5upTPukuvOe0=; b=r5zLMerJpWDjNeZbEQAxZWSo2xMPs7GmM2ifE/PN0IvF2TNlZ7VTKaq090C1ux5rwV0ntB KNdzU6sAn2FU6NKgbzzwyWXb+fOoJVofHtiOSDoA8q80wAKT/7kz/iAj/yXz/8WqGyOGwb tHiwigIV5NFMEFCrZ+e4E79pwjNeMrULwwX/qvy2j+9jdHQarbd3pZwe+Q7T2o+oHerBW7 gSRwnJGWJIelCeYXuqo9B2foyCyJD3hh6/AQc2djzFzG8TzxMowYo9LXhBeyyYMQJkxtWZ azxkIrfrO3otxnYvzwSR1+YPdQJ8y7ppXz5Hdm3y/f8cOhO5zS7Dty2gTY00jA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699540830; 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=vEptvHbxibNocBLLvFD5YPzWgoodmLe5upTPukuvOe0=; b=NVumtjiK2GsPF8Uor1hQOvstVHo5hLry+jBlEjlaPBBW19P+eGH2zMAm9BOg+ujQt5uLX4 fplx20p2zfO67XVI76U7+VPWivh3gVGQ1jatm1FiYlAnKy2pcWxGo3sRwKExYSC+CpsjIu NXmT0dpiWCwbpMqe4UtDeDRIc7c+vumDHbF5hk5Q0NYmmXHb8+EEQoDG4EnRkyOmuWBeUF tcyN531wN/fOwwFt0vpeTlM3X3MgIS3kQk1S7Umh4BmO8dkzAohub5lyhcCUJq1EqGZVkS T54kZiuzJpRfCB7/9hRF9bUH4B/BKYSUe/3goUgTD6sw2N+3+5rjLx64FGlTvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699540830; a=rsa-sha256; cv=none; b=b6lSgj21s2Hhjvu68TZ5/IdSyokn6+014BQybdXdXKp3hrWYtk2mvw9i4RVWqbAaShdnzl Uq8QHX9wY8GEe4M1VQomm0nGMXfzuvzg609Jm5K/XchhE/ZGRuRiT+nTZV5v2uqpSOWMUW k6RwJloGdtMBB70gHBbSC9PN/4V3IRvLbeHuFUeRsyUAMk9tZZC4uCqKYqhyJNJNlTNO0r +3pjZwaKg0DRn4QBiU+r1O6eKB7yeFbjzkA/mX7NMed2Gwz6rdBNzk+wQagrHNc2uEV56l r1+7bfs4t9/16o/6MGMrNl2+4SzzOQ7yi3tb9hdcBFvqvN8N5CBTmqCQ35BBqQ== 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 4SR4PV3GT9z4F6; Thu, 9 Nov 2023 14:40:30 +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 3A9EeUwF073301; Thu, 9 Nov 2023 14:40:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A9EeUj5073298; Thu, 9 Nov 2023 14:40:30 GMT (envelope-from git) Date: Thu, 9 Nov 2023 14:40:30 GMT Message-Id: <202311091440.3A9EeUj5073298@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 3c3a703ee657 - stable/14 - amd64: Remove PMAP_INLINE 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3c3a703ee6572fa38768f14329154a10a490379b Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3c3a703ee6572fa38768f14329154a10a490379b commit 3c3a703ee6572fa38768f14329154a10a490379b Author: Mark Johnston AuthorDate: 2023-11-02 18:30:10 +0000 Commit: Mark Johnston CommitDate: 2023-11-09 14:39:57 +0000 amd64: Remove PMAP_INLINE With clang it expands to "inline"; clang in practice may inline externally visible functions even without the hint. So just remove the hints and let the compiler decide. No functional change intended. pmap.o is identical before and after this patch. Reviewed by: alc MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D42446 (cherry picked from commit 2b084923824e0d5133fe5aff580b4e562fe7dd19) --- sys/amd64/amd64/pmap.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index eedbf8fd8067..233069d37bfb 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -338,16 +338,6 @@ safe_to_clear_referenced(pmap_t pmap, pt_entry_t pte) return (FALSE); } -#if !defined(DIAGNOSTIC) -#ifdef __GNUC_GNU_INLINE__ -#define PMAP_INLINE __attribute__((__gnu_inline__)) inline -#else -#define PMAP_INLINE extern inline -#endif -#else -#define PMAP_INLINE -#endif - #ifdef PV_STATS #define PV_STAT(x) do { x ; } while (0) #else @@ -1560,7 +1550,7 @@ pt_entry_t vtoptem __read_mostly = ((1ul << (NPTEPGSHIFT + NPDEPGSHIFT + NPDPEPGSHIFT + NPML4EPGSHIFT)) - 1) << 3; vm_offset_t PTmap __read_mostly = (vm_offset_t)P4Tmap; -PMAP_INLINE pt_entry_t * +pt_entry_t * vtopte(vm_offset_t va) { KASSERT(va >= VM_MAXUSER_ADDRESS, ("vtopte on a uva/gpa 0x%0lx", va)); @@ -3623,7 +3613,7 @@ pmap_invalidate_all(pmap_t pmap) } } -PMAP_INLINE void +void pmap_invalidate_cache(void) { @@ -3974,7 +3964,7 @@ pmap_kextract(vm_offset_t va) * Add a wired page to the kva. * Note: not SMP coherent. */ -PMAP_INLINE void +void pmap_kenter(vm_offset_t va, vm_paddr_t pa) { pt_entry_t *pte; @@ -4000,7 +3990,7 @@ pmap_kenter_attr(vm_offset_t va, vm_paddr_t pa, int mode) * Remove a page from the kernel pagetables. * Note: not SMP coherent. */ -PMAP_INLINE void +void pmap_kremove(vm_offset_t va) { pt_entry_t *pte;