From 15ad838d281b3681d96e37cba8a628177da8f4ff Mon Sep 17 00:00:00 2001 From: Thomas Bogendoerfer Date: Thu, 13 Sep 2007 20:23:48 +0200 Subject: [MIPS] Always do the ARC64_TWIDDLE_PC thing. Always jump to the place where the kernel is linked to. This helps where the bootloaders/proms ignores the start address inside the ELF header. Signed-off-by: Thomas Bogendoerfer Signed-off-by: Ralf Baechle --- include/asm-mips/mach-ip27/kernel-entry-init.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/asm-mips/mach-ip27/kernel-entry-init.h b/include/asm-mips/mach-ip27/kernel-entry-init.h index c1a10314b31..624d66c7f29 100644 --- a/include/asm-mips/mach-ip27/kernel-entry-init.h +++ b/include/asm-mips/mach-ip27/kernel-entry-init.h @@ -46,7 +46,14 @@ lh t1, KV_RO_NASID_OFFSET(t0) lh t2, KV_RW_NASID_OFFSET(t0) MAPPED_KERNEL_SETUP_TLB - ARC64_TWIDDLE_PC + + /* + * We might not get launched at the address the kernel is linked to, + * so we jump there. + */ + PTR_LA t0, 0f + jr t0 +0: .endm #endif /* __ASM_MACH_IP27_KERNEL_ENTRY_H */ -- cgit v1.2.3 From 2cfa7660dbf94a61b9d43edaa84be454f9dc25fc Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Thu, 18 Oct 2007 16:00:19 +0100 Subject: [MIPS] time: Delete dead cycles_per_jiffy, mips_timer_ack and null_timer_ack cycles_per_jiffy was only ever getting assigned and the function pointer not being called anymore and mips_timer_ack had gotten similarly stale. I leave the remaining assignments unfixed as a lighthouse pointing platform maintainers to what needs a rewrite. These changes make null_timer_ack() unreferenced, so delete that too. Signed-off-by: Ralf Baechle --- include/asm-mips/time.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include') diff --git a/include/asm-mips/time.h b/include/asm-mips/time.h index 35555bd5c52..ff514b40092 100644 --- a/include/asm-mips/time.h +++ b/include/asm-mips/time.h @@ -40,7 +40,6 @@ extern int rtc_mips_set_mmss(unsigned long); * mips_timer_ack may be NULL if the interrupt is self-recoverable. */ extern int (*mips_timer_state)(void); -extern void (*mips_timer_ack)(void); /* * High precision timer clocksource. -- cgit v1.2.3 From 42f77542f4a1c104bb6fbba2e18e04e84415a96b Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Thu, 18 Oct 2007 17:48:11 +0100 Subject: [MIPS] time: Move R4000 clockevent device code to separate configurable file Signed-off-by: Ralf Baechle --- include/asm-mips/time.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include') diff --git a/include/asm-mips/time.h b/include/asm-mips/time.h index ff514b40092..cf76f4f7435 100644 --- a/include/asm-mips/time.h +++ b/include/asm-mips/time.h @@ -75,6 +75,12 @@ extern int (*perf_irq)(void); /* * Initialize the calling CPU's compare interrupt as clockevent device */ +#ifdef CONFIG_CEVT_R4K extern void mips_clockevent_init(void); +#else +static inline void mips_clockevent_init(void) +{ +} +#endif #endif /* _ASM_TIME_H */ -- cgit v1.2.3