system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-22 18:56:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

arm: Rename pte-v6.h to pte.h

Browse source 
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
This commit is contained in:
Andrew Turner 2023-07-24 17:58:15 +01:00
parent 1e7dfc94cc
commit 29629d9e76
5 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/libkvm/kvm_arm.h
View file

@ -83,11 +83,7 @@ typedef uint32_t arm_pt_entry_t;
#ifdef __arm__
#include <machine/acle-compat.h>
#if __ARM_ARCH >= 6
#include <machine/pte-v6.h>
#else
#include <machine/pte-v4.h>
#endif
#include <machine/pte.h>
_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

2
sys/arm/arm/locore-v6.S
View file

@ -34,7 +34,7 @@
#include <machine/asmacros.h>
#include <machine/armreg.h>
#include <machine/sysreg.h>
#include <machine/pte-v6.h>
#include <machine/pte.h>
__FBSDID("$FreeBSD$");

2
sys/arm/include/pmap_var.h
View file

@ -30,7 +30,7 @@
#ifndef _MACHINE_PMAP_VAR_H_
#define _MACHINE_PMAP_VAR_H_
#include <machine/pte-v6.h>
#include <machine/pte.h>
/*
* Various PMAP defines, exports, and inline functions

0
sys/arm/include/pte-v6.h → sys/arm/include/pte.h
View file

2
sys/arm/mv/mv_armv7_machdep.c
View file

@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$");
#include <machine/machdep.h>
#include <machine/platform.h>
#include <machine/platformvar.h>
#include <machine/pte-v6.h>
#include <machine/pte.h>
#include <arm/mv/mvreg.h>
#include <arm/mv/mvvar.h>