[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 01/29] i386: move prototypes to fix implicit declaration of funct
From: |
Marin Ramesa |
Subject: |
[PATCH 01/29] i386: move prototypes to fix implicit declaration of function |
Date: |
Mon, 9 Dec 2013 23:57:16 +0100 |
This fixes the implicit declarations in kern/machine.c and kern/debug.c.
* i386/i386/model_dep.h (halt_cpu, halt_all_cpus): Add prototypes.
* i386/i386at/model_dep.h (halt_cpu, halt_all_cpus): Remove prototypes.
---
i386/i386/model_dep.h | 10 ++++++++++
i386/i386at/model_dep.h | 10 ----------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/i386/i386/model_dep.h b/i386/i386/model_dep.h
index c45b756..ab2738f 100644
--- a/i386/i386/model_dep.h
+++ b/i386/i386/model_dep.h
@@ -41,6 +41,16 @@ extern void resettodr (void);
extern void startrtclock (void);
/*
+ * Halt a cpu.
+ */
+extern void halt_cpu (void) __attribute__ ((noreturn));
+
+/*
+ * Halt the system or reboot.
+ */
+extern void halt_all_cpus (boolean_t reboot) __attribute__ ((noreturn));
+
+/*
* More-specific code provides these;
* they indicate the total extent of physical memory
* that we know about and might ever have to manage.
diff --git a/i386/i386at/model_dep.h b/i386/i386at/model_dep.h
index 7357314..37cd86c 100644
--- a/i386/i386at/model_dep.h
+++ b/i386/i386at/model_dep.h
@@ -23,16 +23,6 @@
extern int timemmap(int dev, int off, vm_prot_t prot);
-/*
- * Halt a cpu.
- */
-extern void halt_cpu (void) __attribute__ ((noreturn));
-
-/*
- * Halt the system or reboot.
- */
-extern void halt_all_cpus (boolean_t reboot) __attribute__ ((noreturn));
-
void inittodr(void);
boolean_t init_alloc_aligned(vm_size_t size, vm_offset_t *addrp);
--
1.8.1.4