From 31d45d0d8ee1d8eee96fc2a283a388b6b6aca669 Mon Sep 17 00:00:00 2001
From: Damien Zammit <damien@zamaudio.com>
Date: Sun, 24 Sep 2023 10:34:49 +0000
Subject: cpu_number: Inline widely used simple function

TESTED: on uniprocessor and smp, both behaved as normal.

Message-Id: <20230924103428.455966-2-damien@zamaudio.com>
---
 kern/ast.h       | 1 -
 kern/processor.h | 3 ++-
 kern/thread.h    | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'kern')

diff --git a/kern/ast.h b/kern/ast.h
index c8cbd04f..aded1677 100644
--- a/kern/ast.h
+++ b/kern/ast.h
@@ -40,7 +40,6 @@
  *	a set of reasons for an AST, and passing this set to ast_taken.
  */
 
-#include "cpu_number.h"
 #include <kern/kern_types.h>
 #include <kern/macros.h>
 #include <machine/ast.h>
diff --git a/kern/processor.h b/kern/processor.h
index 17b784a3..79386627 100644
--- a/kern/processor.h
+++ b/kern/processor.h
@@ -41,7 +41,6 @@
 #include <mach/kern_return.h>
 #include <mach/port.h>
 #include <mach/processor_info.h>
-#include <kern/cpu_number.h>
 #include <kern/lock.h>
 #include <kern/queue.h>
 #include <kern/sched.h>
@@ -112,6 +111,8 @@ struct processor {
 typedef struct processor Processor;
 extern struct processor	processor_array[NCPUS];
 
+#include <kern/cpu_number.h>
+
 /*
  *	Chain of all processor sets.
  */
diff --git a/kern/thread.h b/kern/thread.h
index 8547464d..bf07828a 100644
--- a/kern/thread.h
+++ b/kern/thread.h
@@ -42,7 +42,6 @@
 #include <mach/port.h>
 #include <mach/vm_prot.h>
 #include <kern/ast.h>
-#include <kern/cpu_number.h>
 #include <kern/mach_clock.h>
 #include <kern/queue.h>
 #include <kern/pc_sample.h>
@@ -235,6 +234,8 @@ struct thread {
 #endif
 };
 
+#include <kern/cpu_number.h>
+
 /* typedef of thread_t is in kern/kern_types.h */
 typedef struct thread_shuttle	*thread_shuttle_t;
 #define THREAD_NULL		((thread_t) 0)
-- 
cgit v1.2.3