The branch stable/12 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2f1e66f27040bda7a6fedbbfa6dadcb2c5a7e66c
commit 2f1e66f27040bda7a6fedbbfa6dadcb2c5a7e66c Author: Adam Fenn <[email protected]> AuthorDate: 2021-08-04 15:10:43 +0000 Commit: Konstantin Belousov <[email protected]> CommitDate: 2021-10-12 16:01:26 +0000 x86: files: Make sys/x86/x86/pvclock.c optional Make inclusion of `sys/x86/x86/pvclock.c` contingent on that of its dependents. Sponsored by: Juniper Networks, Inc. Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D31417 (cherry picked from commit 346f5a0c483b7c159efd7c8faf4a18f3e3f77158) --- sys/conf/files.amd64 | 2 +- sys/conf/files.i386 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index ee7d8fc2f072..ad698de09fe7 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -819,7 +819,7 @@ x86/x86/mp_x86.c optional smp x86/x86/mp_watchdog.c optional mp_watchdog smp x86/x86/msi.c optional pci x86/x86/nexus.c standard -x86/x86/pvclock.c standard +x86/x86/pvclock.c optional xenhvm x86/x86/stack_machdep.c optional ddb | stack x86/x86/tsc.c standard x86/x86/ucode.c standard diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index ffbb8c314e3e..934c72c87044 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -635,7 +635,7 @@ x86/x86/nexus.c standard x86/x86/stack_machdep.c optional ddb | stack x86/x86/tsc.c standard x86/x86/ucode.c standard -x86/x86/pvclock.c standard +x86/x86/pvclock.c optional xenhvm x86/x86/delay.c standard x86/xen/hvm.c optional xenhvm x86/xen/xen_intr.c optional xenhvm
