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

Commit c66699a7 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Linus Torvalds
Browse files

[PATCH] clocksource: fixup is_continous changes on ARM 



Fixup the is_contionous replacement by a flag field.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: john stultz <johnstul@us.ibm.com>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 73b08d2a

arch/arm/mach-imx/time.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static struct clocksource clocksource_imx = { 
	.read		= imx_get_cycles,

	.mask		= 0xFFFFFFFF,

	.shift 		= 20,

	.is_continuous 	= 1,

	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,

};



static int __init imx_clocksource_init(void)

arch/arm/mach-ixp4xx/common.c

+1 −1
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ static struct clocksource clocksource_ixp4xx = { 
	.read		= ixp4xx_get_cycles,

	.mask		= CLOCKSOURCE_MASK(32),

	.shift 		= 20,

	.is_continuous 	= 1,

	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,

};



unsigned long ixp4xx_timer_freq = FREQ;

arch/arm/mach-netx/time.c

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ static struct clocksource clocksource_netx = { 
	.read		= netx_get_cycles,

	.mask		= CLOCKSOURCE_MASK(32),

	.shift 		= 20,

	.is_continuous 	= 1,

	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,

};



/*

arch/arm/mach-pxa/time.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static struct clocksource clocksource_pxa = { 
	.read           = pxa_get_cycles,

	.mask           = CLOCKSOURCE_MASK(32),

	.shift          = 20,

	.is_continuous  = 1,

	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,

};



static void __init pxa_timer_init(void)