diff options
| author | Olof Johansson <olof@lixom.net> | 2006-04-18 11:25:53 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-04-22 18:46:11 +1000 |
| commit | 4bd174fe1cca738f53cf8bb9ac3cb327b1f516ed (patch) | |
| tree | e4dffbeddbcb7e7f928c5989f0062f8142f83327 /arch/powerpc/kernel/time.c | |
| parent | 5e1415c3f7d3ad133edb7ce9ca90641cf0f5fe79 (diff) | |
| download | talos-obmc-linux-4bd174fe1cca738f53cf8bb9ac3cb327b1f516ed.tar.gz talos-obmc-linux-4bd174fe1cca738f53cf8bb9ac3cb327b1f516ed.zip | |
[PATCH] powerpc: Remove stale iseries global
Not even the iSeries maintainer seems to have access to this legendary
piranha simulator. It adds a bit of ugliness in the common time init
code, and if it's no longer used we might as well be done with it and
remove the bloat.
Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
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 @@ /* keep track of when we need to update the rtc */ time_t last_rtc_update; -extern int piranha_simulator; #ifdef CONFIG_PPC_ISERIES unsigned long iSeries_recal_titan = 0; unsigned long iSeries_recal_tb = 0; @@ -1010,10 +1009,7 @@ void __init time_init(void) tb_to_ns_scale = scale; tb_to_ns_shift = shift; -#ifdef CONFIG_PPC_ISERIES - if (!piranha_simulator) -#endif - tm = get_boot_time(); + tm = get_boot_time(); write_seqlock_irqsave(&xtime_lock, flags); |
