diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-03 22:22:45 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-03 22:22:45 -0500 |
| commit | 46153552b43675dd4057cd526331b5bd10f39c7d (patch) | |
| tree | 62b6055ee61e320dc10ea81903abbe2e7553bf4e /kernel/timer.c | |
| parent | f90fdc3cce3d8c8ed09615dc68cb789655078803 (diff) | |
| parent | f71e130966ba429dbd24be08ddbcdf263df9a5ad (diff) | |
Merge branch 'net-const'
Diffstat (limited to 'kernel/timer.c')
| -rw-r--r-- | kernel/timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index fe3a9a9f8328..fc6646fd5aab 100644 --- a/kernel/timer.c +++ b/kernel/timer.c | |||
| @@ -1351,10 +1351,10 @@ static inline u64 time_interpolator_get_cycles(unsigned int src) | |||
| 1351 | return x(); | 1351 | return x(); |
| 1352 | 1352 | ||
| 1353 | case TIME_SOURCE_MMIO64 : | 1353 | case TIME_SOURCE_MMIO64 : |
| 1354 | return readq((void __iomem *) time_interpolator->addr); | 1354 | return readq_relaxed((void __iomem *)time_interpolator->addr); |
| 1355 | 1355 | ||
| 1356 | case TIME_SOURCE_MMIO32 : | 1356 | case TIME_SOURCE_MMIO32 : |
| 1357 | return readl((void __iomem *) time_interpolator->addr); | 1357 | return readl_relaxed((void __iomem *)time_interpolator->addr); |
| 1358 | 1358 | ||
| 1359 | default: return get_cycles(); | 1359 | default: return get_cycles(); |
| 1360 | } | 1360 | } |