Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-05 02:23:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] powerpc: Remove stale iseries global

Browse Source 
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:
Olof Johansson 2006-04-18 11:25:53 -05:00 committed by Paul Mackerras
parent 5e1415c3f7
commit 4bd174fe1c
3 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/powerpc/kernel/time.c
View File

@ -76,7 +76,6 @@
/* keep track of when we need to update the rtc */ /* keep track of when we need to update the rtc */
time_t last_rtc_update; time_t last_rtc_update;
extern int piranha_simulator;
#ifdef CONFIG_PPC_ISERIES #ifdef CONFIG_PPC_ISERIES
unsigned long iSeries_recal_titan = 0; unsigned long iSeries_recal_titan = 0;
unsigned long iSeries_recal_tb = 0; unsigned long iSeries_recal_tb = 0;
@ -1010,10 +1009,7 @@ void __init time_init(void)
tb_to_ns_scale = scale; tb_to_ns_scale = scale;
tb_to_ns_shift = shift; tb_to_ns_shift = shift;
#ifdef CONFIG_PPC_ISERIES tm = get_boot_time();
if (!piranha_simulator)
#endif
tm = get_boot_time();
write_seqlock_irqsave(&xtime_lock, flags); write_seqlock_irqsave(&xtime_lock, flags);

9
arch/powerpc/platforms/iseries/mf.c
View File

@ -45,7 +45,6 @@
#include "setup.h" #include "setup.h"
extern int piranha_simulator;
static int mf_initialized; static int mf_initialized;
/* /*
@ -658,7 +657,7 @@ static void mf_clear_src(void)
void __init mf_display_progress(u16 value) void __init mf_display_progress(u16 value)
{ {
if (piranha_simulator || !mf_initialized) if (!mf_initialized)
return; return;
if (0xFFFF == value) if (0xFFFF == value)
@ -1295,9 +1294,6 @@ __initcall(mf_proc_init);
*/ */
void iSeries_get_rtc_time(struct rtc_time *rtc_tm) void iSeries_get_rtc_time(struct rtc_time *rtc_tm)
{ {
if (piranha_simulator)
return;
mf_get_rtc(rtc_tm); mf_get_rtc(rtc_tm);
rtc_tm->tm_mon--; rtc_tm->tm_mon--;
} }
@ -1316,9 +1312,6 @@ unsigned long iSeries_get_boot_time(void)
{ {
struct rtc_time tm; struct rtc_time tm;
if (piranha_simulator)
return 0;
mf_get_boot_rtc(&tm); mf_get_boot_rtc(&tm);
return mktime(tm.tm_year + 1900, tm.tm_mon, tm.tm_mday, return mktime(tm.tm_year + 1900, tm.tm_mon, tm.tm_mday,
tm.tm_hour, tm.tm_min, tm.tm_sec); tm.tm_hour, tm.tm_min, tm.tm_sec);

5
arch/powerpc/platforms/iseries/setup.c
View File

@ -81,9 +81,6 @@ extern void iSeries_pci_final_fixup(void);
static void iSeries_pci_final_fixup(void) { } static void iSeries_pci_final_fixup(void) { }
#endif #endif
/* Global Variables */
int piranha_simulator;
extern int rd_size; /* Defined in drivers/block/rd.c */ extern int rd_size; /* Defined in drivers/block/rd.c */
extern unsigned long embedded_sysmap_start; extern unsigned long embedded_sysmap_start;
extern unsigned long embedded_sysmap_end; extern unsigned long embedded_sysmap_end;
@ -340,8 +337,6 @@ static void __init iSeries_init_early(void)
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
smp_init_iSeries(); smp_init_iSeries();
#endif #endif
if (itLpNaca.xPirEnvironMode == 0)
piranha_simulator = 1;
/* Associate Lp Event Queue 0 with processor 0 */ /* Associate Lp Event Queue 0 with processor 0 */
HvCallEvent_setLpEventQueueInterruptProc(0, 0); HvCallEvent_setLpEventQueueInterruptProc(0, 0);