git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
x86
/
platform
/
uv
/
uv_time.c
diff --git
a/arch/x86/platform/uv/uv_time.c
b/arch/x86/platform/uv/uv_time.c
index
9daf5d1
..
0eb9018
100644
(file)
--- a/
arch/x86/platform/uv/uv_time.c
+++ b/
arch/x86/platform/uv/uv_time.c
@@
-40,7
+40,6
@@
static struct clocksource clocksource_uv = {
.rating = 400,
.read = uv_read_rtc,
.mask = (cycle_t)UVH_RTC_REAL_TIME_CLOCK_MASK,
.rating = 400,
.read = uv_read_rtc,
.mask = (cycle_t)UVH_RTC_REAL_TIME_CLOCK_MASK,
- .shift = 10,
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
};
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
};
@@
-372,14
+371,11
@@
static __init int uv_rtc_setup_clock(void)
if (!is_uv_system())
return -ENODEV;
if (!is_uv_system())
return -ENODEV;
- clocksource_uv.mult = clocksource_hz2mult(sn_rtc_cycles_per_second,
- clocksource_uv.shift);
-
/* If single blade, prefer tsc */
if (uv_num_possible_blades() == 1)
clocksource_uv.rating = 250;
/* If single blade, prefer tsc */
if (uv_num_possible_blades() == 1)
clocksource_uv.rating = 250;
- rc = clocksource_register
(&clocksource_uv
);
+ rc = clocksource_register
_hz(&clocksource_uv, sn_rtc_cycles_per_second
);
if (rc)
printk(KERN_INFO "UV RTC clocksource failed rc %d\n", rc);
else
if (rc)
printk(KERN_INFO "UV RTC clocksource failed rc %d\n", rc);
else