diff options
| author | Jim Cromie <jim.cromie@gmail.com> | 2006-06-26 00:25:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 09:58:21 -0700 |
| commit | 7f9f303aa33c7acc7b4aa9ebea25cbd990bc707b (patch) | |
| tree | b5916e6b018356afdb5c8687e554a049532633bd /arch | |
| parent | 7d622d4794490cef933c20e4a6279e43e03fafad (diff) | |
[PATCH] generic-time: add macro to simplify/hide mask constants
Add a CLOCKSOURCE_MASK macro to simplify initializing the mask for a struct
clocksource, and use it to replace literal mask constants in the various
clocksource drivers.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Acked-by: John Stultz <johnstul@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/i386/kernel/hpet.c | 4 | ||||
| -rw-r--r-- | arch/i386/kernel/i8253.c | 2 | ||||
| -rw-r--r-- | arch/i386/kernel/tsc.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/i386/kernel/hpet.c b/arch/i386/kernel/hpet.c index 23e7d2c5d253..c6737c35815d 100644 --- a/arch/i386/kernel/hpet.c +++ b/arch/i386/kernel/hpet.c @@ -6,7 +6,7 @@ #include <asm/hpet.h> #include <asm/io.h> -#define HPET_MASK 0xFFFFFFFF +#define HPET_MASK CLOCKSOURCE_MASK(32) #define HPET_SHIFT 22 /* FSEC = 10^-15 NSEC = 10^-9 */ @@ -23,7 +23,7 @@ static struct clocksource clocksource_hpet = { .name = "hpet", .rating = 250, .read = read_hpet, - .mask = (cycle_t)HPET_MASK, + .mask = HPET_MASK, .mult = 0, /* set below */ .shift = HPET_SHIFT, .is_continuous = 1, diff --git a/arch/i386/kernel/i8253.c b/arch/i386/kernel/i8253.c index 5b13739a7ff4..38aa7f19f1d3 100644 --- a/arch/i386/kernel/i8253.c +++ b/arch/i386/kernel/i8253.c @@ -69,7 +69,7 @@ static struct clocksource clocksource_pit = { .name = "pit", .rating = 110, .read = pit_read, - .mask = (cycle_t)-1, + .mask = CLOCKSOURCE_MASK(64), .mult = 0, .shift = 20, }; diff --git a/arch/i386/kernel/tsc.c b/arch/i386/kernel/tsc.c index 1c3c927755de..7e0d8dab2075 100644 --- a/arch/i386/kernel/tsc.c +++ b/arch/i386/kernel/tsc.c @@ -337,7 +337,7 @@ static struct clocksource clocksource_tsc = { .name = "tsc", .rating = 300, .read = read_tsc, - .mask = (cycle_t)-1, + .mask = CLOCKSOURCE_MASK(64), .mult = 0, /* to be set */ .shift = 22, .update_callback = tsc_update_callback, |