diff options
Diffstat (limited to 'kernel/timer.c')
-rw-r--r-- | kernel/timer.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index b7792fb03387..d1e8b975c7ae 100644 --- a/kernel/timer.c +++ b/kernel/timer.c | |||
@@ -103,14 +103,14 @@ static inline tvec_base_t *tbase_get_base(tvec_base_t *base) | |||
103 | static inline void timer_set_deferrable(struct timer_list *timer) | 103 | static inline void timer_set_deferrable(struct timer_list *timer) |
104 | { | 104 | { |
105 | timer->base = ((tvec_base_t *)((unsigned long)(timer->base) | | 105 | timer->base = ((tvec_base_t *)((unsigned long)(timer->base) | |
106 | TBASE_DEFERRABLE_FLAG)); | 106 | TBASE_DEFERRABLE_FLAG)); |
107 | } | 107 | } |
108 | 108 | ||
109 | static inline void | 109 | static inline void |
110 | timer_set_base(struct timer_list *timer, tvec_base_t *new_base) | 110 | timer_set_base(struct timer_list *timer, tvec_base_t *new_base) |
111 | { | 111 | { |
112 | timer->base = (tvec_base_t *)((unsigned long)(new_base) | | 112 | timer->base = (tvec_base_t *)((unsigned long)(new_base) | |
113 | tbase_get_deferrable(timer->base)); | 113 | tbase_get_deferrable(timer->base)); |
114 | } | 114 | } |
115 | 115 | ||
116 | /** | 116 | /** |
@@ -445,10 +445,10 @@ EXPORT_SYMBOL(__mod_timer); | |||
445 | void add_timer_on(struct timer_list *timer, int cpu) | 445 | void add_timer_on(struct timer_list *timer, int cpu) |
446 | { | 446 | { |
447 | tvec_base_t *base = per_cpu(tvec_bases, cpu); | 447 | tvec_base_t *base = per_cpu(tvec_bases, cpu); |
448 | unsigned long flags; | 448 | unsigned long flags; |
449 | 449 | ||
450 | timer_stats_timer_set_start_info(timer); | 450 | timer_stats_timer_set_start_info(timer); |
451 | BUG_ON(timer_pending(timer) || !timer->function); | 451 | BUG_ON(timer_pending(timer) || !timer->function); |
452 | spin_lock_irqsave(&base->lock, flags); | 452 | spin_lock_irqsave(&base->lock, flags); |
453 | timer_set_base(timer, base); | 453 | timer_set_base(timer, base); |
454 | internal_add_timer(base, timer); | 454 | internal_add_timer(base, timer); |
@@ -627,7 +627,7 @@ static inline void __run_timers(tvec_base_t *base) | |||
627 | while (time_after_eq(jiffies, base->timer_jiffies)) { | 627 | while (time_after_eq(jiffies, base->timer_jiffies)) { |
628 | struct list_head work_list; | 628 | struct list_head work_list; |
629 | struct list_head *head = &work_list; | 629 | struct list_head *head = &work_list; |
630 | int index = base->timer_jiffies & TVR_MASK; | 630 | int index = base->timer_jiffies & TVR_MASK; |
631 | 631 | ||
632 | /* | 632 | /* |
633 | * Cascade timers: | 633 | * Cascade timers: |
@@ -644,8 +644,8 @@ static inline void __run_timers(tvec_base_t *base) | |||
644 | unsigned long data; | 644 | unsigned long data; |
645 | 645 | ||
646 | timer = list_first_entry(head, struct timer_list,entry); | 646 | timer = list_first_entry(head, struct timer_list,entry); |
647 | fn = timer->function; | 647 | fn = timer->function; |
648 | data = timer->data; | 648 | data = timer->data; |
649 | 649 | ||
650 | timer_stats_account_timer(timer); | 650 | timer_stats_account_timer(timer); |
651 | 651 | ||
@@ -689,8 +689,8 @@ static unsigned long __next_timer_interrupt(tvec_base_t *base) | |||
689 | index = slot = timer_jiffies & TVR_MASK; | 689 | index = slot = timer_jiffies & TVR_MASK; |
690 | do { | 690 | do { |
691 | list_for_each_entry(nte, base->tv1.vec + slot, entry) { | 691 | list_for_each_entry(nte, base->tv1.vec + slot, entry) { |
692 | if (tbase_get_deferrable(nte->base)) | 692 | if (tbase_get_deferrable(nte->base)) |
693 | continue; | 693 | continue; |
694 | 694 | ||
695 | found = 1; | 695 | found = 1; |
696 | expires = nte->expires; | 696 | expires = nte->expires; |
@@ -834,7 +834,7 @@ void update_process_times(int user_tick) | |||
834 | if (rcu_pending(cpu)) | 834 | if (rcu_pending(cpu)) |
835 | rcu_check_callbacks(cpu, user_tick); | 835 | rcu_check_callbacks(cpu, user_tick); |
836 | scheduler_tick(); | 836 | scheduler_tick(); |
837 | run_posix_cpu_timers(p); | 837 | run_posix_cpu_timers(p); |
838 | } | 838 | } |
839 | 839 | ||
840 | /* | 840 | /* |
@@ -909,7 +909,7 @@ static inline void update_times(unsigned long ticks) | |||
909 | update_wall_time(); | 909 | update_wall_time(); |
910 | calc_load(ticks); | 910 | calc_load(ticks); |
911 | } | 911 | } |
912 | 912 | ||
913 | /* | 913 | /* |
914 | * The 64-bit jiffies value is not atomic - you MUST NOT read it | 914 | * The 64-bit jiffies value is not atomic - you MUST NOT read it |
915 | * without sampling the sequence number in xtime_lock. | 915 | * without sampling the sequence number in xtime_lock. |
@@ -1105,7 +1105,7 @@ asmlinkage long sys_gettid(void) | |||
1105 | /** | 1105 | /** |
1106 | * do_sysinfo - fill in sysinfo struct | 1106 | * do_sysinfo - fill in sysinfo struct |
1107 | * @info: pointer to buffer to fill | 1107 | * @info: pointer to buffer to fill |
1108 | */ | 1108 | */ |
1109 | int do_sysinfo(struct sysinfo *info) | 1109 | int do_sysinfo(struct sysinfo *info) |
1110 | { | 1110 | { |
1111 | unsigned long mem_total, sav_total; | 1111 | unsigned long mem_total, sav_total; |