diff options
-rw-r--r-- | arch/x86/kernel/rtc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c index 69ac9cb9cac6..f7b82ed7b5b5 100644 --- a/arch/x86/kernel/rtc.c +++ b/arch/x86/kernel/rtc.c | |||
@@ -41,11 +41,11 @@ EXPORT_SYMBOL(rtc_lock); | |||
41 | */ | 41 | */ |
42 | int mach_set_rtc_mmss(const struct timespec *now) | 42 | int mach_set_rtc_mmss(const struct timespec *now) |
43 | { | 43 | { |
44 | unsigned long nowtime = now->tv_sec; | 44 | unsigned long long nowtime = now->tv_sec; |
45 | struct rtc_time tm; | 45 | struct rtc_time tm; |
46 | int retval = 0; | 46 | int retval = 0; |
47 | 47 | ||
48 | rtc_time_to_tm(nowtime, &tm); | 48 | rtc_time64_to_tm(nowtime, &tm); |
49 | if (!rtc_valid_tm(&tm)) { | 49 | if (!rtc_valid_tm(&tm)) { |
50 | retval = mc146818_set_time(&tm); | 50 | retval = mc146818_set_time(&tm); |
51 | if (retval) | 51 | if (retval) |
@@ -53,7 +53,7 @@ int mach_set_rtc_mmss(const struct timespec *now) | |||
53 | __func__, retval); | 53 | __func__, retval); |
54 | } else { | 54 | } else { |
55 | printk(KERN_ERR | 55 | printk(KERN_ERR |
56 | "%s: Invalid RTC value: write of %lx to RTC failed\n", | 56 | "%s: Invalid RTC value: write of %llx to RTC failed\n", |
57 | __func__, nowtime); | 57 | __func__, nowtime); |
58 | retval = -EINVAL; | 58 | retval = -EINVAL; |
59 | } | 59 | } |