diff options
| -rw-r--r-- | arch/i386/mach-voyager/voyager_smp.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/arch/i386/mach-voyager/voyager_smp.c b/arch/i386/mach-voyager/voyager_smp.c index 903d739ca74a..a6e0ddd65bd0 100644 --- a/arch/i386/mach-voyager/voyager_smp.c +++ b/arch/i386/mach-voyager/voyager_smp.c | |||
| @@ -97,7 +97,6 @@ static void ack_vic_irq(unsigned int irq); | |||
| 97 | static void vic_enable_cpi(void); | 97 | static void vic_enable_cpi(void); |
| 98 | static void do_boot_cpu(__u8 cpuid); | 98 | static void do_boot_cpu(__u8 cpuid); |
| 99 | static void do_quad_bootstrap(void); | 99 | static void do_quad_bootstrap(void); |
| 100 | static inline void wrapper_smp_local_timer_interrupt(struct pt_regs *); | ||
| 101 | 100 | ||
| 102 | int hard_smp_processor_id(void); | 101 | int hard_smp_processor_id(void); |
| 103 | 102 | ||
| @@ -126,6 +125,14 @@ send_QIC_CPI(__u32 cpuset, __u8 cpi) | |||
| 126 | } | 125 | } |
| 127 | 126 | ||
| 128 | static inline void | 127 | static inline void |
| 128 | wrapper_smp_local_timer_interrupt(struct pt_regs *regs) | ||
| 129 | { | ||
| 130 | irq_enter(); | ||
| 131 | smp_local_timer_interrupt(regs); | ||
| 132 | irq_exit(); | ||
| 133 | } | ||
| 134 | |||
| 135 | static inline void | ||
| 129 | send_one_CPI(__u8 cpu, __u8 cpi) | 136 | send_one_CPI(__u8 cpu, __u8 cpi) |
| 130 | { | 137 | { |
| 131 | if(voyager_quad_processors & (1<<cpu)) | 138 | if(voyager_quad_processors & (1<<cpu)) |
| @@ -1249,14 +1256,6 @@ smp_vic_timer_interrupt(struct pt_regs *regs) | |||
| 1249 | smp_local_timer_interrupt(regs); | 1256 | smp_local_timer_interrupt(regs); |
| 1250 | } | 1257 | } |
| 1251 | 1258 | ||
| 1252 | static inline void | ||
| 1253 | wrapper_smp_local_timer_interrupt(struct pt_regs *regs) | ||
| 1254 | { | ||
| 1255 | irq_enter(); | ||
| 1256 | smp_local_timer_interrupt(regs); | ||
| 1257 | irq_exit(); | ||
| 1258 | } | ||
| 1259 | |||
| 1260 | /* local (per CPU) timer interrupt. It does both profiling and | 1259 | /* local (per CPU) timer interrupt. It does both profiling and |
| 1261 | * process statistics/rescheduling. | 1260 | * process statistics/rescheduling. |
| 1262 | * | 1261 | * |
