git: 41e6d2091ce5 - main - Enable subr_physmem_test on supported architectures

The branch main has been updated by andrew:

URL: https://cgit.FreeBSD.org/src/commit/?id=41e6d2091ce5653d4ace3f0b9cbde1375d458c67

commit 41e6d2091ce5653d4ace3f0b9cbde1375d458c67
Author:     Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2022-04-07 13:29:25 +0000
Commit:     Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2022-04-07 13:31:51 +0000

    Enable subr_physmem_test on supported architectures
    
    Only build where it's supported.
    
    While here add support for amd64 to help with testing.
    
    Sponsored by:   The FreeBSD Foundation
---
 sys/kern/subr_physmem.c | 2 +-
 tests/sys/kern/Makefile | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sys/kern/subr_physmem.c b/sys/kern/subr_physmem.c
index 08f08f0c1a5d..2c7837019ea2 100644
--- a/sys/kern/subr_physmem.c
+++ b/sys/kern/subr_physmem.c
@@ -73,7 +73,7 @@ __FBSDID("$FreeBSD$");
 
 #if defined(__arm__)
 #define	MAX_PHYS_ADDR	0xFFFFFFFFull
-#elif defined(__aarch64__) || defined(__riscv)
+#elif defined(__aarch64__) || defined(__amd64__) || defined(__riscv)
 #define	MAX_PHYS_ADDR	0xFFFFFFFFFFFFFFFFull
 #endif
 
diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile
index dcca803ec70e..e674329f77b1 100644
--- a/tests/sys/kern/Makefile
+++ b/tests/sys/kern/Makefile
@@ -23,7 +23,9 @@ ATF_TESTS_C+=	ptrace_test
 TEST_METADATA.ptrace_test+=		timeout="15"
 ATF_TESTS_C+=	reaper
 ATF_TESTS_C+=	sigaltstack
-#ATF_TESTS_C+=	subr_physmem_test
+.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH:Mpowerpc*} == ""
+ATF_TESTS_C+=	subr_physmem_test
+.endif
 PLAIN_TESTS_C+=	subr_unit_test
 ATF_TESTS_C+=	sysctl_kern_proc
 ATF_TESTS_C+=	sys_getrandom