diff options
| author | Kyle McMartin <kyle@parisc-linux.org> | 2005-11-18 16:39:20 -0500 |
|---|---|---|
| committer | Kyle McMartin <kyle@parisc-linux.org> | 2005-11-18 16:39:20 -0500 |
| commit | 2161558fa5bebfeb272493ae91e836b497029023 (patch) | |
| tree | 16304f91757243626d74e65063ee7224cacbf797 /arch/powerpc/kernel/rtas-rtc.c | |
| parent | e670dfb9a4f9e136da44db167da75b2365f7cebb (diff) | |
| parent | e67b23c71cb9ee02d65a74c3858716ba2dedd554 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/powerpc/kernel/rtas-rtc.c')
| -rw-r--r-- | arch/powerpc/kernel/rtas-rtc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/rtas-rtc.c b/arch/powerpc/kernel/rtas-rtc.c index 7b948662704c..635d3b9a8811 100644 --- a/arch/powerpc/kernel/rtas-rtc.c +++ b/arch/powerpc/kernel/rtas-rtc.c | |||
| @@ -15,7 +15,7 @@ unsigned long __init rtas_get_boot_time(void) | |||
| 15 | { | 15 | { |
| 16 | int ret[8]; | 16 | int ret[8]; |
| 17 | int error, wait_time; | 17 | int error, wait_time; |
| 18 | unsigned long max_wait_tb; | 18 | u64 max_wait_tb; |
| 19 | 19 | ||
| 20 | max_wait_tb = get_tb() + tb_ticks_per_usec * 1000 * MAX_RTC_WAIT; | 20 | max_wait_tb = get_tb() + tb_ticks_per_usec * 1000 * MAX_RTC_WAIT; |
| 21 | do { | 21 | do { |
| @@ -45,7 +45,7 @@ void rtas_get_rtc_time(struct rtc_time *rtc_tm) | |||
| 45 | { | 45 | { |
| 46 | int ret[8]; | 46 | int ret[8]; |
| 47 | int error, wait_time; | 47 | int error, wait_time; |
| 48 | unsigned long max_wait_tb; | 48 | u64 max_wait_tb; |
| 49 | 49 | ||
| 50 | max_wait_tb = get_tb() + tb_ticks_per_usec * 1000 * MAX_RTC_WAIT; | 50 | max_wait_tb = get_tb() + tb_ticks_per_usec * 1000 * MAX_RTC_WAIT; |
| 51 | do { | 51 | do { |
| @@ -80,7 +80,7 @@ void rtas_get_rtc_time(struct rtc_time *rtc_tm) | |||
| 80 | int rtas_set_rtc_time(struct rtc_time *tm) | 80 | int rtas_set_rtc_time(struct rtc_time *tm) |
| 81 | { | 81 | { |
| 82 | int error, wait_time; | 82 | int error, wait_time; |
| 83 | unsigned long max_wait_tb; | 83 | u64 max_wait_tb; |
| 84 | 84 | ||
| 85 | max_wait_tb = get_tb() + tb_ticks_per_usec * 1000 * MAX_RTC_WAIT; | 85 | max_wait_tb = get_tb() + tb_ticks_per_usec * 1000 * MAX_RTC_WAIT; |
| 86 | do { | 86 | do { |