diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 17:06:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-08 17:06:51 -0800 |
| commit | 0bdd340c092b0936f78a54bdbd3927463ed4fca3 (patch) | |
| tree | d9215d382cdc4c2dc6366a2c551079590e8b8216 /arch/ia64/kernel/setup.c | |
| parent | 9908104935325bd6beba67d637b6f5396d47075c (diff) | |
| parent | f478af9dc58c01880832a321c3eea7703772c420 (diff) | |
| download | linux-0bdd340c092b0936f78a54bdbd3927463ed4fca3.tar.gz linux-0bdd340c092b0936f78a54bdbd3927463ed4fca3.tar.bz2 linux-0bdd340c092b0936f78a54bdbd3927463ed4fca3.zip | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'arch/ia64/kernel/setup.c')
| -rw-r--r-- | arch/ia64/kernel/setup.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index c0766575a3a2..35f7835294a3 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c @@ -71,6 +71,8 @@ unsigned long __per_cpu_offset[NR_CPUS]; EXPORT_SYMBOL(__per_cpu_offset); #endif +extern void ia64_setup_printk_clock(void); + DEFINE_PER_CPU(struct cpuinfo_ia64, cpu_info); DEFINE_PER_CPU(unsigned long, local_per_cpu_offset); DEFINE_PER_CPU(unsigned long, ia64_phys_stacked_size_p8); @@ -445,6 +447,8 @@ setup_arch (char **cmdline_p) /* process SAL system table: */ ia64_sal_init(efi.sal_systab); + ia64_setup_printk_clock(); + #ifdef CONFIG_SMP cpu_physical_id(0) = hard_smp_processor_id(); |