Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc038491 authored Jul 21, 2008 by Jaswinder Singh Committed by Ingo Molnar Jul 22, 2008

x86: time_XX.c declare functions before they get used



Declare time_init() in asm-x86/time.h

Also did cleanup in asm-x86/timer.h :
timer_ack is only required for X86_32
int recalibrate_cpu_khz(void) is for X86_32

Signed-off-by: Jaswinder Singh <jaswinder@infradead.org>

parent b994b6c0

arch/x86/kernel/time_32.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -36,6 +36,7 @@
	#include <asm/arch_hooks.h>		#include <asm/arch_hooks.h>
	#include <asm/hpet.h>		#include <asm/hpet.h>
	#include <asm/time.h>		#include <asm/time.h>
			#include <asm/timer.h>

	#include "do_timer.h"		#include "do_timer.h"

include/asm-x86/time.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -46,6 +46,8 @@ static inline int native_set_wallclock(unsigned long nowtime)

	#endif		#endif

			extern void time_init(void);

	#ifdef CONFIG_PARAVIRT		#ifdef CONFIG_PARAVIRT
	#include <asm/paravirt.h>		#include <asm/paravirt.h>
	#else /* !CONFIG_PARAVIRT */		#else /* !CONFIG_PARAVIRT */

include/asm-x86/timer.h

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -9,9 +9,12 @@
	unsigned long long native_sched_clock(void);		unsigned long long native_sched_clock(void);
	unsigned long native_calibrate_tsc(void);		unsigned long native_calibrate_tsc(void);

			#ifdef CONFIG_X86_32
	extern int timer_ack;		extern int timer_ack;
	extern int no_timer_check;
	extern int recalibrate_cpu_khz(void);		extern int recalibrate_cpu_khz(void);
			#endif /* CONFIG_X86_32 */

			extern int no_timer_check;

	#ifndef CONFIG_PARAVIRT		#ifndef CONFIG_PARAVIRT
	#define calibrate_tsc() native_calibrate_tsc()		#define calibrate_tsc() native_calibrate_tsc()