diff options
Diffstat (limited to 'arch/powerpc/kernel/time.c')
| -rw-r--r-- | arch/powerpc/kernel/time.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index b861ddcf86bb..528e7f84cb67 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c | |||
| @@ -76,7 +76,6 @@ | |||
| 76 | 76 | ||
| 77 | /* keep track of when we need to update the rtc */ | 77 | /* keep track of when we need to update the rtc */ |
| 78 | time_t last_rtc_update; | 78 | time_t last_rtc_update; |
| 79 | extern int piranha_simulator; | ||
| 80 | #ifdef CONFIG_PPC_ISERIES | 79 | #ifdef CONFIG_PPC_ISERIES |
| 81 | unsigned long iSeries_recal_titan = 0; | 80 | unsigned long iSeries_recal_titan = 0; |
| 82 | unsigned long iSeries_recal_tb = 0; | 81 | unsigned long iSeries_recal_tb = 0; |
| @@ -1010,10 +1009,7 @@ void __init time_init(void) | |||
| 1010 | tb_to_ns_scale = scale; | 1009 | tb_to_ns_scale = scale; |
| 1011 | tb_to_ns_shift = shift; | 1010 | tb_to_ns_shift = shift; |
| 1012 | 1011 | ||
| 1013 | #ifdef CONFIG_PPC_ISERIES | 1012 | tm = get_boot_time(); |
| 1014 | if (!piranha_simulator) | ||
| 1015 | #endif | ||
| 1016 | tm = get_boot_time(); | ||
| 1017 | 1013 | ||
| 1018 | write_seqlock_irqsave(&xtime_lock, flags); | 1014 | write_seqlock_irqsave(&xtime_lock, flags); |
| 1019 | 1015 | ||
