xnu-7195.81.3.tar.gz

[apple/xnu.git] / osfmk / arm64 / machine_routines.c

diff --git a/osfmk/arm64/machine_routines.c b/osfmk/arm64/machine_routines.c
index 03f8a510b8b6540dec8ff017f20eb2ba3cd8c065..c40e24e6f1cbb4c1e779fc171161def396719a43 100644 (file)
--- a/osfmk/arm64/machine_routines.c
+++ b/osfmk/arm64/machine_routines.c
@@ -2289,32 +2289,6 @@ ex_cb_invoke(
 }
 
 #if defined(HAS_APPLE_PAC)
-static inline bool
-cpu_supports_userkeyen()
-{
-#if defined(APPLEFIRESTORM)
-       return __builtin_arm_rsr64(ARM64_REG_APCTL_EL1) & APCTL_EL1_UserKeyEn;
-#elif HAS_APCTL_EL1_USERKEYEN
-       return true;
-#else
-       return false;
-#endif
-}
-
-/**
- * Returns the default JOP key.  Depending on how the CPU diversifies userspace
- * JOP keys, this value may reflect either KERNKeyLo or APIAKeyLo.
- */
-uint64_t
-ml_default_jop_pid(void)
-{
-       if (cpu_supports_userkeyen()) {
-               return KERNEL_KERNKEY_ID;
-       } else {
-               return KERNEL_JOP_ID;
-       }
-}
-
 void
 ml_task_set_disable_user_jop(task_t task, uint8_t disable_user_jop)
 {