diff options
author | Paul Mackerras <paulus@samba.org> | 2005-10-19 19:23:26 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-10-19 19:23:26 -0400 |
commit | f2783c15007468c14972e2617db51e9affc7fad9 (patch) | |
tree | 6c8f57ee8e5cdaeb810a3ccf7f697576a7df7615 /arch/ppc64/kernel/setup.c | |
parent | 03f88e9f7145b03fd0d855918d54a3bf5342ac5e (diff) |
powerpc: Merge time.c and asm/time.h.
We now use the merged time.c for both 32-bit and 64-bit compilation
with ARCH=powerpc, and for ARCH=ppc64, but not for ARCH=ppc32.
This removes setup_default_decr (folds its function into time_init)
and moves wakeup_decrementer into time.c. This also makes an
asm-powerpc/rtc.h.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc64/kernel/setup.c')
-rw-r--r-- | arch/ppc64/kernel/setup.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/ppc64/kernel/setup.c b/arch/ppc64/kernel/setup.c index 776b55b45e1b..3e6c1547b718 100644 --- a/arch/ppc64/kernel/setup.c +++ b/arch/ppc64/kernel/setup.c | |||
@@ -1083,15 +1083,6 @@ void ppc64_terminate_msg(unsigned int src, const char *msg) | |||
1083 | printk("[terminate]%04x %s\n", src, msg); | 1083 | printk("[terminate]%04x %s\n", src, msg); |
1084 | } | 1084 | } |
1085 | 1085 | ||
1086 | /* This should only be called on processor 0 during calibrate decr */ | ||
1087 | void __init setup_default_decr(void) | ||
1088 | { | ||
1089 | struct paca_struct *lpaca = get_paca(); | ||
1090 | |||
1091 | lpaca->default_decr = tb_ticks_per_jiffy; | ||
1092 | lpaca->next_jiffy_update_tb = get_tb() + tb_ticks_per_jiffy; | ||
1093 | } | ||
1094 | |||
1095 | #ifndef CONFIG_PPC_ISERIES | 1086 | #ifndef CONFIG_PPC_ISERIES |
1096 | /* | 1087 | /* |
1097 | * This function can be used by platforms to "find" legacy serial ports. | 1088 | * This function can be used by platforms to "find" legacy serial ports. |