The branch main has been updated by markj:
URL:
https://cgit.FreeBSD.org/src/commit/?id=131c91bd456708d5cb9e574ba8b4f01871df8672
commit 131c91bd456708d5cb9e574ba8b4f01871df8672
Author: Mark Johnston <ma...@freebsd.org>
AuthorDate: 2025-07-17 13:19:28 +0000
Commit: Mark Johnston <ma...@freebsd.org>
CommitDate: 2025-07-17 13:19:28 +0000
amd64: Remove some unused SMP-only defines
No functional change intended.
Reviewed by: kib
Differential Revision: https://reviews.freebsd.org/D51350
---
sys/amd64/amd64/apic_vector.S | 6 ------
sys/amd64/vmm/intel/vmx_support.S | 6 ------
2 files changed, 12 deletions(-)
diff --git a/sys/amd64/amd64/apic_vector.S b/sys/amd64/amd64/apic_vector.S
index 6e51ebff298a..5bb877a174f7 100644
--- a/sys/amd64/amd64/apic_vector.S
+++ b/sys/amd64/amd64/apic_vector.S
@@ -49,12 +49,6 @@
#include <machine/specialreg.h>
#include <x86/apicreg.h>
-#ifdef SMP
-#define LK lock ;
-#else
-#define LK
-#endif
-
.text
SUPERALIGN_TEXT
/* End Of Interrupt to APIC */
diff --git a/sys/amd64/vmm/intel/vmx_support.S
b/sys/amd64/vmm/intel/vmx_support.S
index f393f160b101..130130b64541 100644
--- a/sys/amd64/vmm/intel/vmx_support.S
+++ b/sys/amd64/vmm/intel/vmx_support.S
@@ -32,12 +32,6 @@
#include "vmx_assym.h"
-#ifdef SMP
-#define LK lock ;
-#else
-#define LK
-#endif
-
/* Be friendly to DTrace FBT's prologue/epilogue pattern matching */
#define VENTER push %rbp ; mov %rsp,%rbp
#define VLEAVE pop %rbp
