diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 23:51:02 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-18 23:51:02 +0200 |
| commit | 32c15bb978c0e6ff65b3012a6af5a14c899005ce (patch) | |
| tree | 29b40c7dc083a1f0e3fb199963e88bb73c8b6ea7 /include/asm-mips | |
| parent | Include <linux/backing-dev.h> in mm/filemap.c (diff) | |
| parent | [MIPS] time: Move R4000 clockevent device code to separate configurable file (diff) | |
| download | linux-32c15bb978c0e6ff65b3012a6af5a14c899005ce.tar.xz linux-32c15bb978c0e6ff65b3012a6af5a14c899005ce.zip | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] time: Move R4000 clockevent device code to separate configurable file
[MIPS] time: Delete dead cycles_per_jiffy, mips_timer_ack and null_timer_ack
[MIPS] IP32: Retire use of plat_timer_setup.
[MIPS] Jazz: Retire use of plat_timer_setup.
[MIPS] IP27: Convert to clock_event_device.
[MIPS] JMR3927: Convert to clock_event_device.
[MIPS] Always do the ARC64_TWIDDLE_PC thing.
Diffstat (limited to 'include/asm-mips')
| -rw-r--r-- | include/asm-mips/mach-ip27/kernel-entry-init.h | 9 | ||||
| -rw-r--r-- | include/asm-mips/time.h | 7 |
2 files changed, 14 insertions, 2 deletions
diff --git a/include/asm-mips/mach-ip27/kernel-entry-init.h b/include/asm-mips/mach-ip27/kernel-entry-init.h index c1a10314b317..624d66c7f290 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 */ diff --git a/include/asm-mips/time.h b/include/asm-mips/time.h index 35555bd5c52d..cf76f4f7435f 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. @@ -76,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 */ |