time: move wallclock_time() declaration into common code

It is called from common code, but has architecture specific implementations.
Have one declaration instead of two.

No functional change.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Keir Fraser <keir@xen.org>

diff --git a/xen/include/asm-arm/time.h b/xen/include/asm-arm/time.h
index 9d302d34e895ce17bee26ca6b8f971f1afd00da2..d10c737f51c0f3d0b6e83a06304d888cd8ff43e9 100644 (file)
--- a/xen/include/asm-arm/time.h
+++ b/xen/include/asm-arm/time.h
@@ -12,9 +12,6 @@ static inline cycles_t get_cycles (void)
         return 0;
 }
 
-struct tm;
-struct tm wallclock_time(void);
-
 /* List of timer's IRQ */
 enum timer_ppi
 {

diff --git a/xen/include/asm-x86/time.h b/xen/include/asm-x86/time.h
index 147b39ec23ee92ee174052537433fb19a2f190c4..c01b0a278577d4f2990229c703d7adee3869ddd4 100644 (file)
--- a/xen/include/asm-x86/time.h
+++ b/xen/include/asm-x86/time.h
@@ -48,9 +48,6 @@ int dom0_pit_access(struct ioreq *ioreq);
 
 int cpu_frequency_change(u64 freq);
 
-struct tm;
-struct tm wallclock_time(void);
-
 void pit_broadcast_enter(void);
 void pit_broadcast_exit(void);
 int pit_broadcast_is_available(void);

diff --git a/xen/include/xen/time.h b/xen/include/xen/time.h
index 95b4b9177bf302fa3a24e8282b5f081161bf9332..3eb5b63b5c86255b687b4814e272c3386b41a27a 100644 (file)
--- a/xen/include/xen/time.h
+++ b/xen/include/xen/time.h
@@ -48,6 +48,7 @@ struct tm {
     int     tm_isdst;       /* daylight saving time */
 };
 struct tm gmtime(unsigned long t);
+struct tm wallclock_time(void);
 
 #define SYSTEM_TIME_HZ  1000000000ULL
 #define NOW()           ((s_time_t)get_s_time())