diff options
| -rw-r--r-- | arch/mips/include/asm/idle.h | 7 | ||||
| -rw-r--r-- | arch/mips/kernel/idle.c | 3 |
2 files changed, 0 insertions, 10 deletions
diff --git a/arch/mips/include/asm/idle.h b/arch/mips/include/asm/idle.h index d9f932de80e9..1c967abd545c 100644 --- a/arch/mips/include/asm/idle.h +++ b/arch/mips/include/asm/idle.h | |||
| @@ -8,19 +8,12 @@ extern void (*cpu_wait)(void); | |||
| 8 | extern void r4k_wait(void); | 8 | extern void r4k_wait(void); |
| 9 | extern asmlinkage void __r4k_wait(void); | 9 | extern asmlinkage void __r4k_wait(void); |
| 10 | extern void r4k_wait_irqoff(void); | 10 | extern void r4k_wait_irqoff(void); |
| 11 | extern void __pastwait(void); | ||
| 12 | 11 | ||
| 13 | static inline int using_rollback_handler(void) | 12 | static inline int using_rollback_handler(void) |
| 14 | { | 13 | { |
| 15 | return cpu_wait == r4k_wait; | 14 | return cpu_wait == r4k_wait; |
| 16 | } | 15 | } |
| 17 | 16 | ||
| 18 | static inline int address_is_in_r4k_wait_irqoff(unsigned long addr) | ||
| 19 | { | ||
| 20 | return addr >= (unsigned long)r4k_wait_irqoff && | ||
| 21 | addr < (unsigned long)__pastwait; | ||
| 22 | } | ||
| 23 | |||
| 24 | extern int mips_cpuidle_wait_enter(struct cpuidle_device *dev, | 17 | extern int mips_cpuidle_wait_enter(struct cpuidle_device *dev, |
| 25 | struct cpuidle_driver *drv, int index); | 18 | struct cpuidle_driver *drv, int index); |
| 26 | 19 | ||
diff --git a/arch/mips/kernel/idle.c b/arch/mips/kernel/idle.c index 09ce45980758..0b9082b6b683 100644 --- a/arch/mips/kernel/idle.c +++ b/arch/mips/kernel/idle.c | |||
| @@ -68,9 +68,6 @@ void r4k_wait_irqoff(void) | |||
| 68 | " wait \n" | 68 | " wait \n" |
| 69 | " .set pop \n"); | 69 | " .set pop \n"); |
| 70 | local_irq_enable(); | 70 | local_irq_enable(); |
| 71 | __asm__( | ||
| 72 | " .globl __pastwait \n" | ||
| 73 | "__pastwait: \n"); | ||
| 74 | } | 71 | } |
| 75 | 72 | ||
| 76 | /* | 73 | /* |
