summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarin Ramesa <mpr@hi.t-com.hr>2013-12-09 23:57:16 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2013-12-10 00:30:16 +0100
commitfe7b4a8bbfd41c90f16ab4b1bcd82babb811c7a7 (patch)
tree13b484d17a97ed408764761653a2318501906f06
parente95d650716ec19e450baf1249d4d21025a8a289f (diff)
i386: move prototypes to fix implicit declaration of function
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.
-rw-r--r--i386/i386/model_dep.h10
-rw-r--r--i386/i386at/model_dep.h10
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);