The branch main has been updated by imp:

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

commit bd6cd409a955b4a0b0b0d0633b4bbf5e3eac6fdb
Author:     Elliott Mitchell <ehem+free...@m5p.com>
AuthorDate: 2024-12-06 01:58:13 +0000
Commit:     Warner Losh <i...@freebsd.org>
CommitDate: 2024-12-06 02:07:45 +0000

    x86: remove LOCORE: No longer needed
    
    Remove the #ifdef LOCORE. No assembly file includes this file since the
    XEN update of 1a52c1053049.
    
    Pull-Request: https://github.com/freebsd/freebsd-src/pull/1286
---
 sys/x86/include/intr_machdep.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/sys/x86/include/intr_machdep.h b/sys/x86/include/intr_machdep.h
index d7bfcdc126a9..9e913440c712 100644
--- a/sys/x86/include/intr_machdep.h
+++ b/sys/x86/include/intr_machdep.h
@@ -62,8 +62,6 @@ extern u_int num_msi_irqs;
  */
 #define        MSI_INTEL_ADDR_BASE             0xfee00000
 
-#ifndef LOCORE
-
 typedef void inthand_t(void);
 
 #define        IDTVEC(name)    __CONCAT(X,name)
@@ -165,6 +163,5 @@ int msix_release(int irq);
 void   xen_intr_alloc_irqs(void);
 #endif
 
-#endif /* !LOCORE */
 #endif /* _KERNEL */
 #endif /* !__X86_INTR_MACHDEP_H__ */

Reply via email to