From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933145AbXAWWPS (ORCPT ); Tue, 23 Jan 2007 17:15:18 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S933153AbXAWWL5 (ORCPT ); Tue, 23 Jan 2007 17:11:57 -0500 Received: from www.osadl.org ([213.239.205.134]:35836 "EHLO mail.tglx.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933145AbXAWWAy (ORCPT ); Tue, 23 Jan 2007 17:00:54 -0500 Message-Id: <20070123211204.717252000@localhost.localdomain> References: <20070123211159.178138000@localhost.localdomain> Date: Tue, 23 Jan 2007 22:01:08 -0000 From: Thomas Gleixner To: Andrew Morton Cc: LKML , Ingo Molnar , John Stultz , Arjan van de Veen , Roman Zippel Subject: [patch 13/46] clocksource: fixup is_continous changes on ARM Content-Disposition: inline; filename=clocksource-arm-fixups.patch Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org From: Thomas Gleixner Fixup the is_contionous replacement by a flag field. Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar --- arch/arm/mach-imx/time.c | 2 +- arch/arm/mach-ixp4xx/common.c | 2 +- arch/arm/mach-netx/time.c | 2 +- arch/arm/mach-pxa/time.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) Index: linux-2.6.20-rc4-mm1-bo/arch/arm/mach-imx/time.c =================================================================== --- linux-2.6.20-rc4-mm1-bo.orig/arch/arm/mach-imx/time.c +++ linux-2.6.20-rc4-mm1-bo/arch/arm/mach-imx/time.c @@ -87,7 +87,7 @@ static struct clocksource clocksource_im .read = imx_get_cycles, .mask = 0xFFFFFFFF, .shift = 20, - .is_continuous = 1, + .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; static int __init imx_clocksource_init(void) Index: linux-2.6.20-rc4-mm1-bo/arch/arm/mach-ixp4xx/common.c =================================================================== --- linux-2.6.20-rc4-mm1-bo.orig/arch/arm/mach-ixp4xx/common.c +++ linux-2.6.20-rc4-mm1-bo/arch/arm/mach-ixp4xx/common.c @@ -395,7 +395,7 @@ static struct clocksource clocksource_ix .read = ixp4xx_get_cycles, .mask = CLOCKSOURCE_MASK(32), .shift = 20, - .is_continuous = 1, + .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; unsigned long ixp4xx_timer_freq = FREQ; Index: linux-2.6.20-rc4-mm1-bo/arch/arm/mach-netx/time.c =================================================================== --- linux-2.6.20-rc4-mm1-bo.orig/arch/arm/mach-netx/time.c +++ linux-2.6.20-rc4-mm1-bo/arch/arm/mach-netx/time.c @@ -62,7 +62,7 @@ static struct clocksource clocksource_ne .read = netx_get_cycles, .mask = CLOCKSOURCE_MASK(32), .shift = 20, - .is_continuous = 1, + .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; /* Index: linux-2.6.20-rc4-mm1-bo/arch/arm/mach-pxa/time.c =================================================================== --- linux-2.6.20-rc4-mm1-bo.orig/arch/arm/mach-pxa/time.c +++ linux-2.6.20-rc4-mm1-bo/arch/arm/mach-pxa/time.c @@ -112,7 +112,7 @@ static struct clocksource clocksource_px .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) --