diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-ep93xx/core.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-ixp2000/core.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-ixp23xx/core.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/common.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-omap/timer32k.c | 3 |
5 files changed, 9 insertions, 6 deletions
diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c index dcd417625389..d0eb364fc014 100644 --- a/arch/arm/mach-ep93xx/core.c +++ b/arch/arm/mach-ep93xx/core.c | |||
@@ -103,7 +103,8 @@ static int ep93xx_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
103 | write_seqlock(&xtime_lock); | 103 | write_seqlock(&xtime_lock); |
104 | 104 | ||
105 | __raw_writel(1, EP93XX_TIMER1_CLEAR); | 105 | __raw_writel(1, EP93XX_TIMER1_CLEAR); |
106 | while (__raw_readl(EP93XX_TIMER4_VALUE_LOW) - last_jiffy_time | 106 | while ((signed long) |
107 | (__raw_readl(EP93XX_TIMER4_VALUE_LOW) - last_jiffy_time) | ||
107 | >= TIMER4_TICKS_PER_JIFFY) { | 108 | >= TIMER4_TICKS_PER_JIFFY) { |
108 | last_jiffy_time += TIMER4_TICKS_PER_JIFFY; | 109 | last_jiffy_time += TIMER4_TICKS_PER_JIFFY; |
109 | timer_tick(regs); | 110 | timer_tick(regs); |
diff --git a/arch/arm/mach-ixp2000/core.c b/arch/arm/mach-ixp2000/core.c index 6e8d504aca55..186f632035b8 100644 --- a/arch/arm/mach-ixp2000/core.c +++ b/arch/arm/mach-ixp2000/core.c | |||
@@ -211,7 +211,8 @@ static int ixp2000_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
211 | /* clear timer 1 */ | 211 | /* clear timer 1 */ |
212 | ixp2000_reg_wrb(IXP2000_T1_CLR, 1); | 212 | ixp2000_reg_wrb(IXP2000_T1_CLR, 1); |
213 | 213 | ||
214 | while ((next_jiffy_time - *missing_jiffy_timer_csr) > ticks_per_jiffy) { | 214 | while ((signed long)(next_jiffy_time - *missing_jiffy_timer_csr) |
215 | >= ticks_per_jiffy) { | ||
215 | timer_tick(regs); | 216 | timer_tick(regs); |
216 | next_jiffy_time -= ticks_per_jiffy; | 217 | next_jiffy_time -= ticks_per_jiffy; |
217 | } | 218 | } |
diff --git a/arch/arm/mach-ixp23xx/core.c b/arch/arm/mach-ixp23xx/core.c index affd1d5d7440..e2aad734080e 100644 --- a/arch/arm/mach-ixp23xx/core.c +++ b/arch/arm/mach-ixp23xx/core.c | |||
@@ -334,7 +334,7 @@ void __init ixp23xx_init_irq(void) | |||
334 | /************************************************************************* | 334 | /************************************************************************* |
335 | * Timer-tick functions for IXP23xx | 335 | * Timer-tick functions for IXP23xx |
336 | *************************************************************************/ | 336 | *************************************************************************/ |
337 | #define CLOCK_TICKS_PER_USEC CLOCK_TICK_RATE / (USEC_PER_SEC) | 337 | #define CLOCK_TICKS_PER_USEC (CLOCK_TICK_RATE / USEC_PER_SEC) |
338 | 338 | ||
339 | static unsigned long next_jiffy_time; | 339 | static unsigned long next_jiffy_time; |
340 | 340 | ||
@@ -353,7 +353,7 @@ ixp23xx_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
353 | { | 353 | { |
354 | /* Clear Pending Interrupt by writing '1' to it */ | 354 | /* Clear Pending Interrupt by writing '1' to it */ |
355 | *IXP23XX_TIMER_STATUS = IXP23XX_TIMER1_INT_PEND; | 355 | *IXP23XX_TIMER_STATUS = IXP23XX_TIMER1_INT_PEND; |
356 | while ((*IXP23XX_TIMER_CONT - next_jiffy_time) > LATCH) { | 356 | while ((signed long)(*IXP23XX_TIMER_CONT - next_jiffy_time) >= LATCH) { |
357 | timer_tick(regs); | 357 | timer_tick(regs); |
358 | next_jiffy_time += LATCH; | 358 | next_jiffy_time += LATCH; |
359 | } | 359 | } |
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c index 00b761ff0f9c..bf25a76e9bdf 100644 --- a/arch/arm/mach-ixp4xx/common.c +++ b/arch/arm/mach-ixp4xx/common.c | |||
@@ -276,7 +276,7 @@ static irqreturn_t ixp4xx_timer_interrupt(int irq, void *dev_id, struct pt_regs | |||
276 | /* | 276 | /* |
277 | * Catch up with the real idea of time | 277 | * Catch up with the real idea of time |
278 | */ | 278 | */ |
279 | while ((*IXP4XX_OSTS - last_jiffy_time) > LATCH) { | 279 | while ((signed long)(*IXP4XX_OSTS - last_jiffy_time) >= LATCH) { |
280 | timer_tick(regs); | 280 | timer_tick(regs); |
281 | last_jiffy_time += LATCH; | 281 | last_jiffy_time += LATCH; |
282 | } | 282 | } |
diff --git a/arch/arm/plat-omap/timer32k.c b/arch/arm/plat-omap/timer32k.c index b2a943bf11ef..3461a6c9665c 100644 --- a/arch/arm/plat-omap/timer32k.c +++ b/arch/arm/plat-omap/timer32k.c | |||
@@ -210,7 +210,8 @@ static irqreturn_t omap_32k_timer_interrupt(int irq, void *dev_id, | |||
210 | 210 | ||
211 | now = omap_32k_sync_timer_read(); | 211 | now = omap_32k_sync_timer_read(); |
212 | 212 | ||
213 | while (now - omap_32k_last_tick >= OMAP_32K_TICKS_PER_HZ) { | 213 | while ((signed long)(now - omap_32k_last_tick) |
214 | >= OMAP_32K_TICKS_PER_HZ) { | ||
214 | omap_32k_last_tick += OMAP_32K_TICKS_PER_HZ; | 215 | omap_32k_last_tick += OMAP_32K_TICKS_PER_HZ; |
215 | timer_tick(regs); | 216 | timer_tick(regs); |
216 | } | 217 | } |