Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...

[deliverable/linux.git] / drivers / oprofile / oprof.c

diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
index 42c9c765f9f16bfe49b7d34905f95b933dda47ef..dc8a0428260dd3d5c141982d0da9dcdaceca70f7 100644 (file)
--- a/drivers/oprofile/oprof.c
+++ b/drivers/oprofile/oprof.c
@@ -29,15 +29,6 @@ unsigned long oprofile_backtrace_depth;
 static unsigned long is_setup;
 static DEFINE_MUTEX(start_mutex);
 
-#ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
-
-static void switch_worker(struct work_struct *work);
-static DECLARE_DELAYED_WORK(switch_work, switch_worker);
-unsigned long timeout_jiffies;
-#define MULTIPLEXING_TIMER_DEFAULT 1
-
-#endif
-
 /* timer
    0 - use performance monitoring hardware if available
    1 - use the timer int mechanism regardless
@@ -100,17 +91,66 @@ out:
 
 #ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
 
+static void switch_worker(struct work_struct *work);
+static DECLARE_DELAYED_WORK(switch_work, switch_worker);
+
 static void start_switch_worker(void)
 {
-       schedule_delayed_work(&switch_work, timeout_jiffies);
+       if (oprofile_ops.switch_events)
+               schedule_delayed_work(&switch_work, oprofile_time_slice);
+}
+
+static void stop_switch_worker(void)
+{
+       cancel_delayed_work_sync(&switch_work);
 }
 
 static void switch_worker(struct work_struct *work)
 {
-       if (!oprofile_ops.switch_events())
-               start_switch_worker();
+       if (oprofile_ops.switch_events())
+               return;
+
+       atomic_inc(&oprofile_stats.multiplex_counter);
+       start_switch_worker();
+}
+
+/* User inputs in ms, converts to jiffies */
+int oprofile_set_timeout(unsigned long val_msec)
+{
+       int err = 0;
+       unsigned long time_slice;
+
+       mutex_lock(&start_mutex);
+
+       if (oprofile_started) {
+               err = -EBUSY;
+               goto out;
+       }
+
+       if (!oprofile_ops.switch_events) {
+               err = -EINVAL;
+               goto out;
+       }
+
+       time_slice = msecs_to_jiffies(val_msec);
+       if (time_slice == MAX_JIFFY_OFFSET) {
+               err = -EINVAL;
+               goto out;
+       }
+
+       oprofile_time_slice = time_slice;
+
+out:
+       mutex_unlock(&start_mutex);
+       return err;
+
 }
 
+#else
+
+static inline void start_switch_worker(void) { }
+static inline void stop_switch_worker(void) { }
+
 #endif
 
 /* Actually start profiling (echo 1>/dev/oprofile/enable) */
@@ -133,10 +173,7 @@ int oprofile_start(void)
        if ((err = oprofile_ops.start()))
                goto out;
 
-#ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
-       if (oprofile_ops.switch_events)
-               start_switch_worker();
-#endif
+       start_switch_worker();
 
        oprofile_started = 1;
 out:
@@ -154,9 +191,7 @@ void oprofile_stop(void)
        oprofile_ops.stop();
        oprofile_started = 0;
 
-#ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
-       cancel_delayed_work_sync(&switch_work);
-#endif
+       stop_switch_worker();
 
        /* wake up the daemon to read what remains */
        wake_up_buffer_waiter();
@@ -190,42 +225,6 @@ post_sync:
        mutex_unlock(&start_mutex);
 }
 
-#ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
-
-/* User inputs in ms, converts to jiffies */
-int oprofile_set_timeout(unsigned long val_msec)
-{
-       int err = 0;
-       unsigned long time_slice;
-
-       mutex_lock(&start_mutex);
-
-       if (oprofile_started) {
-               err = -EBUSY;
-               goto out;
-       }
-
-       if (!oprofile_ops.switch_events) {
-               err = -EINVAL;
-               goto out;
-       }
-
-       time_slice = msecs_to_jiffies(val_msec);
-       if (time_slice == MAX_JIFFY_OFFSET) {
-               err = -EINVAL;
-               goto out;
-       }
-
-       timeout_jiffies = time_slice;
-
-out:
-       mutex_unlock(&start_mutex);
-       return err;
-
-}
-
-#endif
-
 int oprofile_set_backtrace(unsigned long val)
 {
        int err = 0;
@@ -249,23 +248,10 @@ out:
        return err;
 }
 
-#ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
-
-static void __init oprofile_multiplexing_init(void)
-{
-       timeout_jiffies = msecs_to_jiffies(MULTIPLEXING_TIMER_DEFAULT);
-}
-
-#endif
-
 static int __init oprofile_init(void)
 {
        int err;
 
-#ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
-       oprofile_multiplexing_init();
-#endif
-
        err = oprofile_arch_init(&oprofile_ops);
 
        if (err < 0 || timer) {