From nobody Mon Jul 24 16:58:47 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 4R8mZw2kHBz4ndpH; Mon, 24 Jul 2023 16:58: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 4R8mZw0ZQSz4GVp; Mon, 24 Jul 2023 16:58:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690217928; 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=GRTaYzL4bZsK38V9NlQQIQ6e3ts8NwpFO42EEHybA34=; b=pjManATGusyt3MhLI0cVqFc8ikUdvQ7SBR6l8zmJlRLSjbrSc4ADzhWfqGAqPOh7fPoZBM 1oqNDW70inW2+Sa5CuikzMHtS8A3yRz8o2ltEUaGKDmv90THRBW8wvhUdamAdoa8nWKZOO fLucu1Ob2aIf48UbC6B5o3ZzooeMoFfRkNiPKLjXZ7639aN11rnEsqVFlw0IY+wYZLcHcf uE2Ld2kppfP6bDgie5GTV8VjtUl5unragdth4lgaablw7qWaVgf1M0S7ITCxh6QhRlB+Un IlGw2GTDu+nCgffqzhzOqbRdD/G3MFMBG/KENbCSn6uGer8E1j7j9O/GCAoFkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690217928; 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=GRTaYzL4bZsK38V9NlQQIQ6e3ts8NwpFO42EEHybA34=; b=D+vqa06MCSdmyTBrdACYyM55ADcDw4lzpuXQoFDEoTVfYcpH0b4TvYcC+NZmiyMF28ljHD wQyTDshwRNQ9H2Ipa+GzfExnLCKt4TQsRrMpdVRC3b95yiko1ZDVWSZVM3fow+d9mIam2S bF232+Xyxok9gbeIo/js4BHND9vRz41Cts2mpUp+Gwwh7FUKOc74qySIYObkWx3/QW8hEN n+KyCoyr9ILoNEUUBBgz3OP+Njtkn6QTyLsSqLt3Lu3eCMeyYm4DdsllWDBI6mNZupsSuG nWQZrf4iW7fJBUb5NXtADeB/EYgCwx/5CdeOoLI0N2T3sGwMqBC2FE9nDtfnSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690217928; a=rsa-sha256; cv=none; b=of3kiApyTsdfjt6we4Iu0lDcsqq2nHzL5I5PvHo9J1zh9SeQqp1kfHLxJG+MzgdA01jMnx 8OeWjEPLhldl0YNAlu3dIkIdp1JDbuEbYu5T4MZhwaY4+ozxOT4WiTcpE36GdoUtrGvL4D AL8KCZ4mYG0r1AJB/ueKxZou+IQtc09d9ey969w5pnRGrx3tfS1T5qxSqw6BcpXaJ/++V8 aowJO7bSa3fk1S7LE4sDUqCMxvyuk3O/ydtwdgjPpFyEjFJFQ1Fdh+BzA/SemmedMhlZA1 l/JeaTKDtLQD5n48dTM/JIVDrcoJ1KSseoFq1RBk2Kvpyzk0UMC74rmT2/7nLQ== 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 4R8mZv6nRNzQZD; Mon, 24 Jul 2023 16:58:47 +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 36OGwlM2096726; Mon, 24 Jul 2023 16:58:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36OGwldh096725; Mon, 24 Jul 2023 16:58:47 GMT (envelope-from git) Date: Mon, 24 Jul 2023 16:58:47 GMT Message-Id: <202307241658.36OGwldh096725@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 29629d9e763f - main - arm: Rename pte-v6.h to pte.h 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 29629d9e763f62a481fa795caaa04bb0b030980f Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=29629d9e763f62a481fa795caaa04bb0b030980f commit 29629d9e763f62a481fa795caaa04bb0b030980f Author: Andrew Turner AuthorDate: 2023-07-24 16:58:15 +0000 Commit: Andrew Turner CommitDate: 2023-07-24 16:58:15 +0000 arm: Rename pte-v6.h to pte.h There is no need for this to be versioned after the removal of armv4/v5 Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D41139 --- lib/libkvm/kvm_arm.h | 9 +-------- sys/arm/arm/locore-v6.S | 2 +- sys/arm/include/pmap_var.h | 2 +- sys/arm/include/{pte-v6.h => pte.h} | 0 sys/arm/mv/mv_armv7_machdep.c | 2 +- 5 files changed, 4 insertions(+), 11 deletions(-) diff --git a/lib/libkvm/kvm_arm.h b/lib/libkvm/kvm_arm.h index f441d65860ec..300c44902393 100644 --- a/lib/libkvm/kvm_arm.h +++ b/lib/libkvm/kvm_arm.h @@ -83,11 +83,7 @@ typedef uint32_t arm_pt_entry_t; #ifdef __arm__ #include -#if __ARM_ARCH >= 6 -#include -#else -#include -#endif +#include _Static_assert(PAGE_SHIFT == ARM_PAGE_SHIFT, "PAGE_SHIFT mismatch"); _Static_assert(PAGE_SIZE == ARM_PAGE_SIZE, "PAGE_SIZE mismatch"); @@ -114,9 +110,6 @@ _Static_assert(L1_C_ADDR_MASK == ARM_L1_C_ADDR_MASK, "L1_C_ADDR_MASK mismatch"); _Static_assert(L2_TYPE_INV == ARM_L2_TYPE_INV, "L2_TYPE_INV mismatch"); _Static_assert(L2_TYPE_L == ARM_L2_TYPE_L, "L2_TYPE_L mismatch"); _Static_assert(L2_TYPE_S == ARM_L2_TYPE_S, "L2_TYPE_S mismatch"); -#if __ARM_ARCH < 6 -_Static_assert(L2_TYPE_T == ARM_L2_TYPE_T, "L2_TYPE_T mismatch"); -#endif _Static_assert(L2_TYPE_MASK == ARM_L2_TYPE_MASK, "L2_TYPE_MASK mismatch"); #endif diff --git a/sys/arm/arm/locore-v6.S b/sys/arm/arm/locore-v6.S index ad96b0b9d638..7104ae124cf1 100644 --- a/sys/arm/arm/locore-v6.S +++ b/sys/arm/arm/locore-v6.S @@ -34,7 +34,7 @@ #include #include #include -#include +#include __FBSDID("$FreeBSD$"); diff --git a/sys/arm/include/pmap_var.h b/sys/arm/include/pmap_var.h index 08d32575f82a..e746ed513d4f 100644 --- a/sys/arm/include/pmap_var.h +++ b/sys/arm/include/pmap_var.h @@ -30,7 +30,7 @@ #ifndef _MACHINE_PMAP_VAR_H_ #define _MACHINE_PMAP_VAR_H_ -#include +#include /* * Various PMAP defines, exports, and inline functions diff --git a/sys/arm/include/pte-v6.h b/sys/arm/include/pte.h similarity index 100% rename from sys/arm/include/pte-v6.h rename to sys/arm/include/pte.h diff --git a/sys/arm/mv/mv_armv7_machdep.c b/sys/arm/mv/mv_armv7_machdep.c index c7f5f0e4d13b..f08b62048e1e 100644 --- a/sys/arm/mv/mv_armv7_machdep.c +++ b/sys/arm/mv/mv_armv7_machdep.c @@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include +#include #include #include