Commit da7ce6e2feb8e5b3ac3c1c365937c7ab009c76a2
Committed by
Linus Torvalds
Linus Torvalds
1 parent
78187865ef
Exists in
master
and in
7 other branches
asm-h8300: parentheses around definition CLOCK_TICK_RATE
Some places where CLOCK_TICK_RATE may be used incorrectly: arch/arm/mach-mx3/time.c:125: __raw_writel((v / CLOCK_TICK_RATE) - 1, MXC_GPT_GPTPR); drivers/watchdog/davinci_wdt.c:103: timer_margin = (((u64)heartbeat * CLOCK_TICK_RATE) & 0xffffffff); drivers/watchdog/davinci_wdt.c:105: timer_margin = (((u64)heartbeat * CLOCK_TICK_RATE) >> 32); drivers/watchdog/ks8695_wdt.c:64: unsigned long tval = wdt_time * CLOCK_TICK_RATE; I'm not sure whether this definition is used there, but adding parentheses should be good anyway. Signed-off-by: Roel Kluin <12o3l@tiscali.nl> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff
include/asm-h8300/timex.h
| ... | ... | @@ -6,7 +6,7 @@ |
| 6 | 6 | #ifndef _ASM_H8300_TIMEX_H |
| 7 | 7 | #define _ASM_H8300_TIMEX_H |
| 8 | 8 | |
| 9 | -#define CLOCK_TICK_RATE CONFIG_CPU_CLOCK*1000/8192 /* Timer input freq. */ | |
| 9 | +#define CLOCK_TICK_RATE (CONFIG_CPU_CLOCK*1000/8192) /* Timer input freq. */ | |
| 10 | 10 | |
| 11 | 11 | typedef unsigned long cycles_t; |
| 12 | 12 | extern short h8300_timer_count; |