History

[PATCH] remove timer debug field

Remove timer_list.magic and associated debugging code. I originally added this when a spinlock was added to timer_list - this meant that an all-zeroes timer became illegal and init_timer() was required. That spinlock isn't even there any more, although timer.base must now be initialised. I'll keep this debugging code in -mm.

Andrew Morton committed 21 years ago

Commit dfc4f941 parent 89ada673 files · +2 −56Browse files

Showing the changes to kernel/timer.c (1 of 3 files). Show all

Unified · Split

kernel/timer.c+0−35
@@ -91,30 +91,6 @@ static inline void set_running_timer(tvec_base_t *base, · 90 unmodified lines
9191 #endif
9292 }
9393
94−static void check_timer_failed(struct timer_list *timer)
95−{
96− static int whine_count;
97− if (whine_count < 16) {
98− whine_count++;
99− printk("Uninitialised timer!\n");
100− printk("This is just a warning. Your computer is OK\n");
101− printk("function=0x%p, data=0x%lx\n",
102− timer->function, timer->data);
103− dump_stack();
104− }
105− /*
106− * Now fix it up
107− */
108− timer->magic = TIMER_MAGIC;
109−}
110−
111−static inline void check_timer(struct timer_list *timer)
112−{
113− if (timer->magic != TIMER_MAGIC)
114− check_timer_failed(timer);
115−}
116−
117−
11894 static void internal_add_timer(tvec_base_t *base, struct timer_list *timer)
11995 {
12096 unsigned long expires = timer->expires;
@@ -177,7 +153,6 @@ void fastcall init_timer(struct timer_list *timer) · 56 unmodified lines
177153 {
178154 timer->entry.next = NULL;
179155 timer->base = &per_cpu(tvec_bases, raw_smp_processor_id()).t_base;
180− timer->magic = TIMER_MAGIC;
181156 }
182157 EXPORT_SYMBOL(init_timer);
183158
@@ -230,7 +205,6 @@ int __mod_timer(struct timer_list *timer, unsigned long expires) · 46 unmodified lines
230205 int ret = 0;
231206
232207 BUG_ON(!timer->function);
233− check_timer(timer);
234208
235209 base = lock_timer_base(timer, &flags);
236210
@@ -283,9 +257,6 @@ void add_timer_on(struct timer_list *timer, int cpu) · 46 unmodified lines
283257 unsigned long flags;
284258
285259 BUG_ON(timer_pending(timer) || !timer->function);
286−
287− check_timer(timer);
288−
289260 spin_lock_irqsave(&base->t_base.lock, flags);
290261 timer->base = &base->t_base;
291262 internal_add_timer(base, timer);
@@ -316,8 +287,6 @@ int mod_timer(struct timer_list *timer, unsigned long expires) · 24 unmodified lines
316287 {
317288 BUG_ON(!timer->function);
318289
319− check_timer(timer);
320−
321290 /*
322291 * This is a common optimization triggered by the
323292 * networking code - if the timer is re-modified
@@ -348,8 +317,6 @@ int del_timer(struct timer_list *timer) · 24 unmodified lines
348317 unsigned long flags;
349318 int ret = 0;
350319
351− check_timer(timer);
352−
353320 if (timer_pending(timer)) {
354321 base = lock_timer_base(timer, &flags);
355322 if (timer_pending(timer)) {
@@ -412,8 +379,6 @@ out: · 56 unmodified lines
412379 */
413380 int del_timer_sync(struct timer_list *timer)
414381 {
415− check_timer(timer);
416−
417382 for (;;) {
418383 int ret = try_to_del_timer_sync(timer);
419384 if (ret >= 0)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t