git: 459e0b92e8ae - main - Use the arm64 ttbr macro to define the ASID shift

[Andrew Turner]

The branch main has been updated by andrew:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=459e0b92e8aef0048e19a306c4626ed72356a3d0

commit 459e0b92e8aef0048e19a306c4626ed72356a3d0
Author:     Andrew Turner <and...@freebsd.org>
AuthorDate: 2022-01-05 14:30:40 +0000
Commit:     Andrew Turner <and...@freebsd.org>
CommitDate: 2022-01-05 14:56:25 +0000

    Use the arm64 ttbr macro to define the ASID shift
    
    Now we have a macro to descrive the arm64 TTBR registers use it in the
    ASID_TO_OPERAND pmap macro.
    
    Sponsored by:   The FreeBSD Foundation
---
 sys/arm64/include/pmap.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sys/arm64/include/pmap.h b/sys/arm64/include/pmap.h
index 1421d19aabda..90c70e8eca95 100644
--- a/sys/arm64/include/pmap.h
+++ b/sys/arm64/include/pmap.h
@@ -146,10 +146,9 @@ extern struct pmap kernel_pmap_store;
 #define        ASID_RESERVED_FOR_PID_0 0
 #define        ASID_RESERVED_FOR_EFI   1
 #define        ASID_FIRST_AVAILABLE    (ASID_RESERVED_FOR_EFI + 1)
-#define        ASID_TO_OPERAND_SHIFT   48
 #define        ASID_TO_OPERAND(asid)   ({                                      
\
        KASSERT((asid) != -1, ("invalid ASID"));                        \
-       (uint64_t)(asid) << ASID_TO_OPERAND_SHIFT;                      \
+       (uint64_t)(asid) << TTBR_ASID_SHIFT;                    \
 })
 
 extern vm_offset_t virtual_avail;