summaryrefslogtreecommitdiff
path: root/sys/inc
diff options
context:
space:
mode:
Diffstat (limited to 'sys/inc')
-rw-r--r--sys/inc/kern/cpu.h46
-rw-r--r--sys/inc/mu/cpu.h12
2 files changed, 11 insertions, 47 deletions
diff --git a/sys/inc/kern/cpu.h b/sys/inc/kern/cpu.h
deleted file mode 100644
index dfd0c34..0000000
--- a/sys/inc/kern/cpu.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2025 Ian Marco Moffett and the Osmora Team.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Hyra nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPKERNE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LKERNS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * PKERNSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _KERN_CPU_H_
-#define _KERN_CPU_H_ 1
-
-#include <sys/types.h>
-
-/*
- * Processor descriptor
- *
- * @id: Logical ID of the processor
- * @self: Self pointer for referencing via %GS
- */
-struct cpu_info {
- uint8_t id;
- struct cpu_info *self;
-};
-
-#endif /* !_KERN_CPU_H_ */
diff --git a/sys/inc/mu/cpu.h b/sys/inc/mu/cpu.h
index fb7aade..967005e 100644
--- a/sys/inc/mu/cpu.h
+++ b/sys/inc/mu/cpu.h
@@ -31,7 +31,17 @@
#define _MU_CPU_H_ 1
#include <sys/types.h>
-#include <kern/cpu.h>
+
+/*
+ * Processor descriptor
+ *
+ * @id: Logical ID of the processor
+ * @self: Self pointer for referencing via %GS
+ */
+struct cpu_info {
+ uint8_t id;
+ struct cpu_info *self;
+};
/*
* Get a reference to the processor descriptor