summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2013-12-05 06:24:00 +0900
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2013-12-05 06:24:00 +0900
commit4297d6038e93d87554116a0b311dd6daf1da985e (patch)
tree25c96edc08e335da8b04148eac7f371973d4385b
parente2f055b0224da1ee74398ff77e49e12e398e7afa (diff)
Drop duplicate declaration
* i386/i386/model_dep.h (halt_cpu, halt_all_cpus): Remove duplicate declaration. * i386/i386at/model_dep.h (halt_cpu, halt_all_cpus): Add comments.
-rw-r--r--i386/i386/model_dep.h10
-rw-r--r--i386/i386at/model_dep.h11
2 files changed, 9 insertions, 12 deletions
diff --git a/i386/i386/model_dep.h b/i386/i386/model_dep.h
index a41c474..c45b756 100644
--- a/i386/i386/model_dep.h
+++ b/i386/i386/model_dep.h
@@ -36,16 +36,6 @@ extern void machine_init (void);
/* Conserve power on processor CPU. */
extern void machine_idle (int cpu);
-/*
- * 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));
-
extern void resettodr (void);
extern void startrtclock (void);
diff --git a/i386/i386at/model_dep.h b/i386/i386at/model_dep.h
index 11c6451..65dc00b 100644
--- a/i386/i386at/model_dep.h
+++ b/i386/i386at/model_dep.h
@@ -23,8 +23,15 @@
extern int timemmap(int dev, int off, vm_prot_t prot);
-void halt_all_cpus(boolean_t reboot) __attribute__ ((noreturn));
-void halt_cpu(void) __attribute__ ((noreturn));
+/*
+ * 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);