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

Commit 16f871bc authored Jun 01, 2011 by Ralf Baechle Committed by Thomas Gleixner Jun 09, 2011

x86: i8253: Consolidate definitions of global_clock_event



There are multiple declarations of global_clock_event in header files
specific to particular clock event implementations.  Consolidate them
in <asm/time.h> and make sure all users include that header.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Cc: Venkatesh Pallipadi (Venki) <venki@google.com>
Link: http://lkml.kernel.org/r/20110601180610.762763451@duck.linux-mips.net


Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parent 75bba014

arch/x86/include/asm/apb_timer.h

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -50,7 +50,6 @@
	#define APBT_DEV_USED 1		#define APBT_DEV_USED 1

	extern void apbt_time_init(void);		extern void apbt_time_init(void);
	extern struct clock_event_device *global_clock_event;
	extern unsigned long apbt_quick_calibrate(void);		extern unsigned long apbt_quick_calibrate(void);
	extern int arch_setup_apbt_irqs(int irq, int trigger, int mask, int cpu);		extern int arch_setup_apbt_irqs(int irq, int trigger, int mask, int cpu);
	extern void apbt_setup_secondary_clock(void);		extern void apbt_setup_secondary_clock(void);

arch/x86/include/asm/i8253.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -3,8 +3,6 @@

	#define PIT_LATCH LATCH		#define PIT_LATCH LATCH

	extern struct clock_event_device *global_clock_event;

	extern void setup_pit_timer(void);		extern void setup_pit_timer(void);

	#endif /* _ASM_X86_I8253_H */		#endif /* _ASM_X86_I8253_H */

arch/x86/include/asm/time.h

+4 −2

Original line number	Original line	Diff line number	Diff line
	#ifndef _ASM_X86_TIME_H		#ifndef _ASM_X86_TIME_H
	#define _ASM_X86_TIME_H		#define _ASM_X86_TIME_H

	extern void hpet_time_init(void);		#include <linux/clocksource.h>

	#include <asm/mc146818rtc.h>		#include <asm/mc146818rtc.h>

			extern void hpet_time_init(void);
	extern void time_init(void);		extern void time_init(void);

			extern struct clock_event_device *global_clock_event;

	#endif /* _ASM_X86_TIME_H */		#endif /* _ASM_X86_TIME_H */

arch/x86/kernel/apb_timer.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -44,6 +44,7 @@
	#include <asm/fixmap.h>		#include <asm/fixmap.h>
	#include <asm/apb_timer.h>		#include <asm/apb_timer.h>
	#include <asm/mrst.h>		#include <asm/mrst.h>
			#include <asm/time.h>

	#define APBT_MASK CLOCKSOURCE_MASK(32)		#define APBT_MASK CLOCKSOURCE_MASK(32)
	#define APBT_SHIFT 22		#define APBT_SHIFT 22

arch/x86/kernel/apic/apic.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -48,6 +48,7 @@
	#include <asm/hpet.h>		#include <asm/hpet.h>
	#include <asm/idle.h>		#include <asm/idle.h>
	#include <asm/mtrr.h>		#include <asm/mtrr.h>
			#include <asm/time.h>
	#include <asm/smp.h>		#include <asm/smp.h>
	#include <asm/mce.h>		#include <asm/mce.h>
	#include <asm/tsc.h>		#include <asm/tsc.h>