diff options
| author | Tony Luck <tony.luck@intel.com> | 2009-06-17 12:35:24 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2009-06-17 12:35:24 -0400 |
| commit | 27f70c3117194f98beb009dc48bb2aa267f505bf (patch) | |
| tree | 22afa3fb31376da9e37f09a78745afe3f16fde8a /arch/ia64/kernel/time.c | |
| parent | d186b86ffcad713a1dd3d03e9d4ce2d59f61a1ed (diff) | |
| parent | e088a4ad7fa53c3dc3c29f930025f41ccf01953e (diff) | |
Pull for-2.6.31 into release
Diffstat (limited to 'arch/ia64/kernel/time.c')
| -rw-r--r-- | arch/ia64/kernel/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c index 604c1a35db33..4990495d7531 100644 --- a/arch/ia64/kernel/time.c +++ b/arch/ia64/kernel/time.c | |||
| @@ -385,7 +385,7 @@ ia64_init_itm (void) | |||
| 385 | 385 | ||
| 386 | static cycle_t itc_get_cycles(struct clocksource *cs) | 386 | static cycle_t itc_get_cycles(struct clocksource *cs) |
| 387 | { | 387 | { |
| 388 | u64 lcycle, now, ret; | 388 | unsigned long lcycle, now, ret; |
| 389 | 389 | ||
| 390 | if (!itc_jitter_data.itc_jitter) | 390 | if (!itc_jitter_data.itc_jitter) |
| 391 | return get_cycles(); | 391 | return get_cycles(); |