diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-09-28 21:11:41 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-09-28 21:11:41 +1000 |
| commit | 952ecef7a0479049c8abb7c34a688ec2981ceadd (patch) | |
| tree | 74377080bb1fe12e874d18cb77461341a904f854 /arch/ppc64/kernel/rtc.c | |
| parent | beeca08738c4c4024c81a591812bfe38f8c436c0 (diff) | |
| parent | 252e75a51d40757928d692b3d339e66838294b4b (diff) | |
| download | kernel-crypto-952ecef7a0479049c8abb7c34a688ec2981ceadd.tar.gz kernel-crypto-952ecef7a0479049c8abb7c34a688ec2981ceadd.tar.xz kernel-crypto-952ecef7a0479049c8abb7c34a688ec2981ceadd.zip | |
Merge Stephen Rothwell's patches
Diffstat (limited to 'arch/ppc64/kernel/rtc.c')
| -rw-r--r-- | arch/ppc64/kernel/rtc.c | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/arch/ppc64/kernel/rtc.c b/arch/ppc64/kernel/rtc.c index 6ff52bc6132..88ae13f81c4 100644 --- a/arch/ppc64/kernel/rtc.c +++ b/arch/ppc64/kernel/rtc.c @@ -43,11 +43,8 @@ #include <asm/time.h> #include <asm/rtas.h> -#include <asm/iSeries/mf.h> #include <asm/machdep.h> -extern int piranha_simulator; - /* * We sponge a minor off of the misc major. No need slurping * up another valuable major dev number for this. If you add @@ -265,40 +262,6 @@ static int rtc_read_proc(char *page, char **start, off_t off, return len; } -#ifdef CONFIG_PPC_ISERIES -/* - * Get the RTC from the virtual service processor - * This requires flowing LpEvents to the primary partition - */ -void iSeries_get_rtc_time(struct rtc_time *rtc_tm) -{ - if (piranha_simulator) - return; - - mf_get_rtc(rtc_tm); - rtc_tm->tm_mon--; -} - -/* - * Set the RTC in the virtual service processor - * This requires flowing LpEvents to the primary partition - */ -int iSeries_set_rtc_time(struct rtc_time *tm) -{ - mf_set_rtc(tm); - return 0; -} - -void iSeries_get_boot_time(struct rtc_time *tm) -{ - if ( piranha_simulator ) - return; - - mf_get_boot_rtc(tm); - tm->tm_mon -= 1; -} -#endif - #ifdef CONFIG_PPC_RTAS #define MAX_RTC_WAIT 5000 /* 5 sec */ #define RTAS_CLOCK_BUSY (-2) |