diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2005-06-23 09:43:07 +1000 |
|---|---|---|
| committer |   Paul Mackerras <paulus@samba.org> | 2005-06-23 09:43:07 +1000 |
| commit | 10f7e7c15e6ce41799c5dba6925ae4bf8048c870 (patch) | |
| tree | 505c9834749cd59bd8a075db7577c3b26a002f92 /arch/ppc64/kernel/setup.c | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| download | linux-dev-10f7e7c15e6ce41799c5dba6925ae4bf8048c870.tar.xz linux-dev-10f7e7c15e6ce41799c5dba6925ae4bf8048c870.zip | |
[PATCH] ppc64: consolidate calibrate_decr implementations
pSeries and maple have almost the same code for calibrate_decr,
and BPA would need yet another copy. Instead, I'm moving the
code to arch/ppc64/kernel/time.c.
Some of the related declarations were missing from header
files, so I'm moving those as well.
It makes sense to merge this with the pmac function of the
same name, so we end up having just one implemetation for
iSeries and one for Open Firmware based machines.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc64/kernel/setup.c')
| -rw-r--r-- | arch/ppc64/kernel/setup.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/ppc64/kernel/setup.c b/arch/ppc64/kernel/setup.c index 8e439a817642..93b0ee88cda1 100644 --- a/arch/ppc64/kernel/setup.c +++ b/arch/ppc64/kernel/setup.c @@ -701,9 +701,6 @@ void machine_halt(void) EXPORT_SYMBOL(machine_halt); -unsigned long ppc_proc_freq; -unsigned long ppc_tb_freq; - static int ppc64_panic_event(struct notifier_block *this, unsigned long event, void *ptr) { @@ -1117,7 +1114,7 @@ void ppc64_dump_msg(unsigned int src, const char *msg) } /* This should only be called on processor 0 during calibrate decr */ -void setup_default_decr(void) +void __init setup_default_decr(void) { struct paca_struct *lpaca = get_paca(); |