From 4297d6038e93d87554116a0b311dd6daf1da985e Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Thu, 5 Dec 2013 06:24:00 +0900
Subject: 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.
---
 i386/i386/model_dep.h   | 10 ----------
 i386/i386at/model_dep.h | 11 +++++++++--
 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);
 
-- 
cgit v1.2.3