Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86faf39d authored by Ingo Molnar's avatar Ingo Molnar
Browse files

sched: remove printk_clock references from ia64 



remove remaining printk_clock references from ia64.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent b842271f

arch/ia64/kernel/setup.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -71,8 +71,6 @@ unsigned long __per_cpu_offset[NR_CPUS]; 
EXPORT_SYMBOL(__per_cpu_offset);

EXPORT_SYMBOL(__per_cpu_offset);

#endif

#endif





extern void ia64_setup_printk_clock(void);



DEFINE_PER_CPU(struct cpuinfo_ia64, cpu_info);

DEFINE_PER_CPU(struct cpuinfo_ia64, cpu_info);

DEFINE_PER_CPU(unsigned long, local_per_cpu_offset);

DEFINE_PER_CPU(unsigned long, local_per_cpu_offset);

unsigned long ia64_cycles_per_usec;

unsigned long ia64_cycles_per_usec;
@@ -507,8 +505,6 @@ setup_arch (char **cmdline_p) 
	/* process SAL system table: */

	/* process SAL system table: */

	ia64_sal_init(__va(efi.sal_systab));

	ia64_sal_init(__va(efi.sal_systab));





	ia64_setup_printk_clock();



#ifdef CONFIG_SMP

#ifdef CONFIG_SMP

	cpu_physical_id(0) = hard_smp_processor_id();

	cpu_physical_id(0) = hard_smp_processor_id();

#endif

#endif

arch/ia64/sn/kernel/setup.c

+0 −11
Original line number Original line Diff line number Diff line
@@ -64,7 +64,6 @@ extern void sn_timer_init(void); 
extern unsigned long last_time_offset;

extern unsigned long last_time_offset;

extern void (*ia64_mark_idle) (int);

extern void (*ia64_mark_idle) (int);

extern void snidle(int);

extern void snidle(int);

extern unsigned long long (*ia64_printk_clock)(void);





unsigned long sn_rtc_cycles_per_second;

unsigned long sn_rtc_cycles_per_second;

EXPORT_SYMBOL(sn_rtc_cycles_per_second);

EXPORT_SYMBOL(sn_rtc_cycles_per_second);
@@ -360,14 +359,6 @@ sn_scan_pcdp(void) 




static unsigned long sn2_rtc_initial;

static unsigned long sn2_rtc_initial;





static unsigned long long ia64_sn2_printk_clock(void)

{

	unsigned long rtc_now = rtc_time();



	return (rtc_now - sn2_rtc_initial) *

		(1000000000 / sn_rtc_cycles_per_second);

}



/**

/**

 * sn_setup - SN platform setup routine

 * sn_setup - SN platform setup routine

 * @cmdline_p: kernel command line

 * @cmdline_p: kernel command line
@@ -468,8 +459,6 @@ void __init sn_setup(char **cmdline_p) 




	platform_intr_list[ACPI_INTERRUPT_CPEI] = IA64_CPE_VECTOR;

	platform_intr_list[ACPI_INTERRUPT_CPEI] = IA64_CPE_VECTOR;





	ia64_printk_clock = ia64_sn2_printk_clock;



	printk("SGI SAL version %x.%02x\n", version >> 8, version & 0x00FF);

	printk("SGI SAL version %x.%02x\n", version >> 8, version & 0x00FF);





	/*

	/*