2007-01-31 03:40:58

by Daniel Walker

[permalink] [raw]
Subject: [PATCH 16/23] clocksource: arm update for new flags

Update ARM for new flags.

Signed-Off-By: Daniel Walker <[email protected]>

---
arch/arm/mach-imx/time.c | 1 -
arch/arm/mach-ixp4xx/common.c | 1 -
arch/arm/mach-netx/time.c | 1 -
arch/arm/mach-pxa/time.c | 1 -
4 files changed, 4 deletions(-)

Index: linux-2.6.19/arch/arm/mach-imx/time.c
===================================================================
--- linux-2.6.19.orig/arch/arm/mach-imx/time.c
+++ linux-2.6.19/arch/arm/mach-imx/time.c
@@ -87,7 +87,6 @@ static struct clocksource clocksource_im
.read = imx_get_cycles,
.mask = 0xFFFFFFFF,
.shift = 20,
- .flags = CLOCK_SOURCE_IS_CONTINUOUS,
};

static int __init imx_clocksource_init(void)
Index: linux-2.6.19/arch/arm/mach-ixp4xx/common.c
===================================================================
--- linux-2.6.19.orig/arch/arm/mach-ixp4xx/common.c
+++ linux-2.6.19/arch/arm/mach-ixp4xx/common.c
@@ -395,7 +395,6 @@ static struct clocksource clocksource_ix
.read = ixp4xx_get_cycles,
.mask = CLOCKSOURCE_MASK(32),
.shift = 20,
- .flags = CLOCK_SOURCE_IS_CONTINUOUS,
};

unsigned long ixp4xx_timer_freq = FREQ;
Index: linux-2.6.19/arch/arm/mach-netx/time.c
===================================================================
--- linux-2.6.19.orig/arch/arm/mach-netx/time.c
+++ linux-2.6.19/arch/arm/mach-netx/time.c
@@ -62,7 +62,6 @@ static struct clocksource clocksource_ne
.read = netx_get_cycles,
.mask = CLOCKSOURCE_MASK(32),
.shift = 20,
- .flags = CLOCK_SOURCE_IS_CONTINUOUS,
};

/*
Index: linux-2.6.19/arch/arm/mach-pxa/time.c
===================================================================
--- linux-2.6.19.orig/arch/arm/mach-pxa/time.c
+++ linux-2.6.19/arch/arm/mach-pxa/time.c
@@ -112,7 +112,6 @@ static struct clocksource clocksource_px
.read = pxa_get_cycles,
.mask = CLOCKSOURCE_MASK(32),
.shift = 20,
- .flags = CLOCK_SOURCE_IS_CONTINUOUS,
};

static void __init pxa_timer_init(void)

--


2007-01-31 12:28:49

by Ingo Molnar

[permalink] [raw]
Subject: Re: [PATCH 16/23] clocksource: arm update for new flags


* Daniel Walker <[email protected]> wrote:

> Update ARM for new flags.
>
> Signed-Off-By: Daniel Walker <[email protected]>

> - .flags = CLOCK_SOURCE_IS_CONTINUOUS,

see my general objection to this change (under the [PATCH 22/23]
subject), but even looking at the pure patch note that it does the flag
update incorrectly and in a bisect-boot-unfriendly way: the queue at
this point changes kernel functionality and has side-effects. The right
way to do flags updates is to first introduce them, then change things
over.

Ingo