lkml.org 
[lkml]   [2003]   [Mar]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] fix oprofile timer race

wli got an oops from this. The callbacks call mod_timer so the timer had
better be setup by then

please apply
john


--- linux/drivers/oprofile/buffer_sync.c 2003-03-06 16:20:31.000000000 +0000
+++ linux-cvs/drivers/oprofile/buffer_sync.c 2003-03-12 15:24:33.000000000 +0000
@@ -82,9 +82,16 @@

int sync_start(void)
{
- int err = profile_event_register(EXIT_TASK, &exit_task_nb);
+ int err;
+
+ init_timer(&sync_timer);
+ sync_timer.function = timer_ping;
+ sync_timer.expires = jiffies + DEFAULT_EXPIRE;
+ add_timer(&sync_timer);
+
+ err = profile_event_register(EXIT_TASK, &exit_task_nb);
if (err)
- goto out;
+ goto out1;
err = profile_event_register(EXIT_MMAP, &exit_mmap_nb);
if (err)
goto out2;
@@ -92,16 +99,14 @@
if (err)
goto out3;

- init_timer(&sync_timer);
- sync_timer.function = timer_ping;
- sync_timer.expires = jiffies + DEFAULT_EXPIRE;
- add_timer(&sync_timer);
out:
return err;
out3:
profile_event_unregister(EXIT_MMAP, &exit_mmap_nb);
out2:
profile_event_unregister(EXIT_TASK, &exit_task_nb);
+out1:
+ del_timer_sync(&sync_timer);
goto out;
}

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 13:33    [W:0.022 / U:31.876 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site