[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>
This commit is contained in:
parent
5e1415c3f7
commit
4bd174fe1c
@ -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);
|
||||
|
||||
|
@ -45,7 +45,6 @@
|
||||
|
||||
#include "setup.h"
|
||||
|
||||
extern int piranha_simulator;
|
||||
static int mf_initialized;
|
||||
|
||||
/*
|
||||
@ -658,7 +657,7 @@ static void mf_clear_src(void)
|
||||
|
||||
void __init mf_display_progress(u16 value)
|
||||
{
|
||||
if (piranha_simulator || !mf_initialized)
|
||||
if (!mf_initialized)
|
||||
return;
|
||||
|
||||
if (0xFFFF == value)
|
||||
@ -1295,9 +1294,6 @@ __initcall(mf_proc_init);
|
||||
*/
|
||||
void iSeries_get_rtc_time(struct rtc_time *rtc_tm)
|
||||
{
|
||||
if (piranha_simulator)
|
||||
return;
|
||||
|
||||
mf_get_rtc(rtc_tm);
|
||||
rtc_tm->tm_mon--;
|
||||
}
|
||||
@ -1316,9 +1312,6 @@ unsigned long iSeries_get_boot_time(void)
|
||||
{
|
||||
struct rtc_time tm;
|
||||
|
||||
if (piranha_simulator)
|
||||
return 0;
|
||||
|
||||
mf_get_boot_rtc(&tm);
|
||||
return mktime(tm.tm_year + 1900, tm.tm_mon, tm.tm_mday,
|
||||
tm.tm_hour, tm.tm_min, tm.tm_sec);
|
||||
|
@ -81,9 +81,6 @@ extern void iSeries_pci_final_fixup(void);
|
||||
static void iSeries_pci_final_fixup(void) { }
|
||||
#endif
|
||||
|
||||
/* Global Variables */
|
||||
int piranha_simulator;
|
||||
|
||||
extern int rd_size; /* Defined in drivers/block/rd.c */
|
||||
extern unsigned long embedded_sysmap_start;
|
||||
extern unsigned long embedded_sysmap_end;
|
||||
@ -340,8 +337,6 @@ static void __init iSeries_init_early(void)
|
||||
#ifdef CONFIG_SMP
|
||||
smp_init_iSeries();
|
||||
#endif
|
||||
if (itLpNaca.xPirEnvironMode == 0)
|
||||
piranha_simulator = 1;
|
||||
|
||||
/* Associate Lp Event Queue 0 with processor 0 */
|
||||
HvCallEvent_setLpEventQueueInterruptProc(0, 0);
|
||||
|
Loading…
Reference in New Issue
Block a user