diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-arm/arch-clps711x/time.h | 2 | ||||
-rw-r--r-- | include/asm-arm/arch-l7200/time.h | 2 | ||||
-rw-r--r-- | include/asm-i386/mach-default/do_timer.h | 2 | ||||
-rw-r--r-- | include/asm-i386/mach-visws/do_timer.h | 2 | ||||
-rw-r--r-- | include/asm-i386/mach-voyager/do_timer.h | 2 | ||||
-rw-r--r-- | include/linux/sched.h | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/include/asm-arm/arch-clps711x/time.h b/include/asm-arm/arch-clps711x/time.h index 9cb27cd4e6ae..0e4a3901d3b3 100644 --- a/include/asm-arm/arch-clps711x/time.h +++ b/include/asm-arm/arch-clps711x/time.h | |||
@@ -29,7 +29,7 @@ static irqreturn_t | |||
29 | p720t_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 29 | p720t_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) |
30 | { | 30 | { |
31 | do_leds(); | 31 | do_leds(); |
32 | do_timer(regs); | 32 | do_timer(1); |
33 | #ifndef CONFIG_SMP | 33 | #ifndef CONFIG_SMP |
34 | update_process_times(user_mode(regs)); | 34 | update_process_times(user_mode(regs)); |
35 | #endif | 35 | #endif |
diff --git a/include/asm-arm/arch-l7200/time.h b/include/asm-arm/arch-l7200/time.h index 7b98b533e63a..c69cb508735f 100644 --- a/include/asm-arm/arch-l7200/time.h +++ b/include/asm-arm/arch-l7200/time.h | |||
@@ -45,7 +45,7 @@ | |||
45 | static irqreturn_t | 45 | static irqreturn_t |
46 | timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 46 | timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) |
47 | { | 47 | { |
48 | do_timer(regs); | 48 | do_timer(1); |
49 | #ifndef CONFIG_SMP | 49 | #ifndef CONFIG_SMP |
50 | update_process_times(user_mode(regs)); | 50 | update_process_times(user_mode(regs)); |
51 | #endif | 51 | #endif |
diff --git a/include/asm-i386/mach-default/do_timer.h b/include/asm-i386/mach-default/do_timer.h index 6312c3e79814..4182c347ef85 100644 --- a/include/asm-i386/mach-default/do_timer.h +++ b/include/asm-i386/mach-default/do_timer.h | |||
@@ -16,7 +16,7 @@ | |||
16 | 16 | ||
17 | static inline void do_timer_interrupt_hook(struct pt_regs *regs) | 17 | static inline void do_timer_interrupt_hook(struct pt_regs *regs) |
18 | { | 18 | { |
19 | do_timer(regs); | 19 | do_timer(1); |
20 | #ifndef CONFIG_SMP | 20 | #ifndef CONFIG_SMP |
21 | update_process_times(user_mode_vm(regs)); | 21 | update_process_times(user_mode_vm(regs)); |
22 | #endif | 22 | #endif |
diff --git a/include/asm-i386/mach-visws/do_timer.h b/include/asm-i386/mach-visws/do_timer.h index 95568e6ca91c..8db618c5a72b 100644 --- a/include/asm-i386/mach-visws/do_timer.h +++ b/include/asm-i386/mach-visws/do_timer.h | |||
@@ -9,7 +9,7 @@ static inline void do_timer_interrupt_hook(struct pt_regs *regs) | |||
9 | /* Clear the interrupt */ | 9 | /* Clear the interrupt */ |
10 | co_cpu_write(CO_CPU_STAT,co_cpu_read(CO_CPU_STAT) & ~CO_STAT_TIMEINTR); | 10 | co_cpu_write(CO_CPU_STAT,co_cpu_read(CO_CPU_STAT) & ~CO_STAT_TIMEINTR); |
11 | 11 | ||
12 | do_timer(regs); | 12 | do_timer(1); |
13 | #ifndef CONFIG_SMP | 13 | #ifndef CONFIG_SMP |
14 | update_process_times(user_mode_vm(regs)); | 14 | update_process_times(user_mode_vm(regs)); |
15 | #endif | 15 | #endif |
diff --git a/include/asm-i386/mach-voyager/do_timer.h b/include/asm-i386/mach-voyager/do_timer.h index eaf518098981..099fe9f5c1b2 100644 --- a/include/asm-i386/mach-voyager/do_timer.h +++ b/include/asm-i386/mach-voyager/do_timer.h | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | static inline void do_timer_interrupt_hook(struct pt_regs *regs) | 4 | static inline void do_timer_interrupt_hook(struct pt_regs *regs) |
5 | { | 5 | { |
6 | do_timer(regs); | 6 | do_timer(1); |
7 | #ifndef CONFIG_SMP | 7 | #ifndef CONFIG_SMP |
8 | update_process_times(user_mode_vm(regs)); | 8 | update_process_times(user_mode_vm(regs)); |
9 | #endif | 9 | #endif |
diff --git a/include/linux/sched.h b/include/linux/sched.h index ed2af8671589..503dea61ff99 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -1206,7 +1206,7 @@ extern void switch_uid(struct user_struct *); | |||
1206 | 1206 | ||
1207 | #include <asm/current.h> | 1207 | #include <asm/current.h> |
1208 | 1208 | ||
1209 | extern void do_timer(struct pt_regs *); | 1209 | extern void do_timer(unsigned long ticks); |
1210 | 1210 | ||
1211 | extern int FASTCALL(wake_up_state(struct task_struct * tsk, unsigned int state)); | 1211 | extern int FASTCALL(wake_up_state(struct task_struct * tsk, unsigned int state)); |
1212 | extern int FASTCALL(wake_up_process(struct task_struct * tsk)); | 1212 | extern int FASTCALL(wake_up_process(struct task_struct * tsk)); |