The branch main has been updated by andrew:

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

commit 83961b7ede96e61f384f325bbbb38a99513cc9be
Author:     Andrew Turner <[email protected]>
AuthorDate: 2022-03-22 15:48:58 +0000
Commit:     Andrew Turner <[email protected]>
CommitDate: 2022-03-22 16:07:54 +0000

    Remove the unused arm64 kernel profiling code
    
    It's unused. Remove it in preperation for userspace support.
    
    Sponsored by:   The FreeBSD Foundation
---
 sys/arm64/include/profile.h | 34 +++-------------------------------
 1 file changed, 3 insertions(+), 31 deletions(-)

diff --git a/sys/arm64/include/profile.h b/sys/arm64/include/profile.h
index afbfbdb44c0b..86a9703437e7 100644
--- a/sys/arm64/include/profile.h
+++ b/sys/arm64/include/profile.h
@@ -34,47 +34,19 @@
 #ifndef _MACHINE_PROFILE_H_
 #define        _MACHINE_PROFILE_H_
 
-#if !defined(_KERNEL) && !defined(_SYS_CDEFS_H_)
-#error this file needs sys/cdefs.h as a prerequisite
-#endif
-
 #define        FUNCTION_ALIGNMENT      32
 
 typedef u_long fptrdiff_t;
 
-#ifdef _KERNEL
-
-#include <machine/cpufunc.h>
-
-#define        _MCOUNT_DECL    void mcount
-#define        MCOUNT
-
-#define        MCOUNT_DECL(s)  register_t s;
-#define        MCOUNT_ENTER(s) {s = intr_disable(); }
-#define        MCOUNT_EXIT(s)  {intr_restore(s); }
-
-void bintr(void);
-void btrap(void);
-void eintr(void);
-void user(void);
-
-#define        MCOUNT_FROMPC_USER(pc)                                  \
-       ((pc < (uintfptr_t)VM_MAXUSER_ADDRESS) ? (uintfptr_t)user : pc)
-
-#define        MCOUNT_FROMPC_INTR(pc)                                  \
-       ((pc >= (uintfptr_t)btrap && pc < (uintfptr_t)eintr) ?  \
-           ((pc >= (uintfptr_t)bintr) ? (uintfptr_t)bintr :    \
-               (uintfptr_t)btrap) : ~0UL)
-
-void   mcount(uintfptr_t frompc, uintfptr_t selfpc);
+#ifndef _KERNEL
 
-#else /* !_KERNEL */
+#include <sys/cdefs.h>
 
 typedef __uintfptr_t    uintfptr_t;
 
 #define        _MCOUNT_DECL    void mcount
 #define        MCOUNT
 
-#endif /* _KERNEL */
+#endif /* !_KERNEL */
 
 #endif /* !_MACHINE_PROFILE_H_ */

Reply via email to