diff options
-rw-r--r-- | arch/ia64/kernel/setup.c | 4 | ||||
-rw-r--r-- | arch/ia64/sn/kernel/setup.c | 11 |
2 files changed, 0 insertions, 15 deletions
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index 4ac2b1f1bd3b..86028c69861e 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c | |||
@@ -71,8 +71,6 @@ unsigned long __per_cpu_offset[NR_CPUS]; | |||
71 | EXPORT_SYMBOL(__per_cpu_offset); | 71 | EXPORT_SYMBOL(__per_cpu_offset); |
72 | #endif | 72 | #endif |
73 | 73 | ||
74 | extern void ia64_setup_printk_clock(void); | ||
75 | |||
76 | DEFINE_PER_CPU(struct cpuinfo_ia64, cpu_info); | 74 | DEFINE_PER_CPU(struct cpuinfo_ia64, cpu_info); |
77 | DEFINE_PER_CPU(unsigned long, local_per_cpu_offset); | 75 | DEFINE_PER_CPU(unsigned long, local_per_cpu_offset); |
78 | unsigned long ia64_cycles_per_usec; | 76 | unsigned long ia64_cycles_per_usec; |
@@ -507,8 +505,6 @@ setup_arch (char **cmdline_p) | |||
507 | /* process SAL system table: */ | 505 | /* process SAL system table: */ |
508 | ia64_sal_init(__va(efi.sal_systab)); | 506 | ia64_sal_init(__va(efi.sal_systab)); |
509 | 507 | ||
510 | ia64_setup_printk_clock(); | ||
511 | |||
512 | #ifdef CONFIG_SMP | 508 | #ifdef CONFIG_SMP |
513 | cpu_physical_id(0) = hard_smp_processor_id(); | 509 | cpu_physical_id(0) = hard_smp_processor_id(); |
514 | #endif | 510 | #endif |
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c index 1f38a3a68390..bb1d24929640 100644 --- a/arch/ia64/sn/kernel/setup.c +++ b/arch/ia64/sn/kernel/setup.c | |||
@@ -64,7 +64,6 @@ extern void sn_timer_init(void); | |||
64 | extern unsigned long last_time_offset; | 64 | extern unsigned long last_time_offset; |
65 | extern void (*ia64_mark_idle) (int); | 65 | extern void (*ia64_mark_idle) (int); |
66 | extern void snidle(int); | 66 | extern void snidle(int); |
67 | extern unsigned long long (*ia64_printk_clock)(void); | ||
68 | 67 | ||
69 | unsigned long sn_rtc_cycles_per_second; | 68 | unsigned long sn_rtc_cycles_per_second; |
70 | EXPORT_SYMBOL(sn_rtc_cycles_per_second); | 69 | EXPORT_SYMBOL(sn_rtc_cycles_per_second); |
@@ -360,14 +359,6 @@ sn_scan_pcdp(void) | |||
360 | 359 | ||
361 | static unsigned long sn2_rtc_initial; | 360 | static unsigned long sn2_rtc_initial; |
362 | 361 | ||
363 | static unsigned long long ia64_sn2_printk_clock(void) | ||
364 | { | ||
365 | unsigned long rtc_now = rtc_time(); | ||
366 | |||
367 | return (rtc_now - sn2_rtc_initial) * | ||
368 | (1000000000 / sn_rtc_cycles_per_second); | ||
369 | } | ||
370 | |||
371 | /** | 362 | /** |
372 | * sn_setup - SN platform setup routine | 363 | * sn_setup - SN platform setup routine |
373 | * @cmdline_p: kernel command line | 364 | * @cmdline_p: kernel command line |
@@ -468,8 +459,6 @@ void __init sn_setup(char **cmdline_p) | |||
468 | 459 | ||
469 | platform_intr_list[ACPI_INTERRUPT_CPEI] = IA64_CPE_VECTOR; | 460 | platform_intr_list[ACPI_INTERRUPT_CPEI] = IA64_CPE_VECTOR; |
470 | 461 | ||
471 | ia64_printk_clock = ia64_sn2_printk_clock; | ||
472 | |||
473 | printk("SGI SAL version %x.%02x\n", version >> 8, version & 0x00FF); | 462 | printk("SGI SAL version %x.%02x\n", version >> 8, version & 0x00FF); |
474 | 463 | ||
475 | /* | 464 | /* |