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

* 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (24 commits)
  oprofile/x86: make AMD IBS hotplug capable
  oprofile/x86: notify cpus only when daemon is running
  oprofile/x86: reordering some functions
  oprofile/x86: stop disabled counters in nmi handler
  oprofile/x86: protect cpu hotplug sections
  oprofile/x86: remove CONFIG_SMP macros
  oprofile/x86: fix uninitialized counter usage during cpu hotplug
  oprofile/x86: remove duplicate IBS capability check
  oprofile/x86: move IBS code
  oprofile/x86: return -EBUSY if counters are already reserved
  oprofile/x86: moving shutdown functions
  oprofile/x86: reserve counter msrs pairwise
  oprofile/x86: rework error handler in nmi_setup()
  oprofile: update file list in MAINTAINERS file
  oprofile: protect from not being in an IRQ context
  oprofile: remove double ring buffering
  ring-buffer: Add lost event count to end of sub buffer
  tracing: Show the lost events in the trace_pipe output
  ring-buffer: Add place holder recording of dropped events
  tracing: Fix compile error in module tracepoints when MODULE_UNLOAD not set
  ...

1 files changed, 69 insertions, 9 deletions

diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c
index 333f915568c..dc0ae4d14df 100644
--- a/drivers/oprofile/timer_int.c
+++ b/drivers/oprofile/timer_int.c
@@ -13,34 +13,94 @@
 #include <linux/oprofile.h>
 #include <linux/profile.h>
 #include <linux/init.h>
+#include <linux/cpu.h>
+#include <linux/hrtimer.h>
+#include <asm/irq_regs.h>
 #include <asm/ptrace.h>
 
 #include "oprof.h"
 
-static int timer_notify(struct pt_regs *regs)
+static DEFINE_PER_CPU(struct hrtimer, oprofile_hrtimer);
+
+static enum hrtimer_restart oprofile_hrtimer_notify(struct hrtimer *hrtimer)
+{
+        oprofile_add_sample(get_irq_regs(), 0);
+        hrtimer_forward_now(hrtimer, ns_to_ktime(TICK_NSEC));
+        return HRTIMER_RESTART;
+}
+
+static void __oprofile_hrtimer_start(void *unused)
+{
+        struct hrtimer *hrtimer = &__get_cpu_var(oprofile_hrtimer);
+
+        hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
+        hrtimer->function = oprofile_hrtimer_notify;
+
+        hrtimer_start(hrtimer, ns_to_ktime(TICK_NSEC),
+                      HRTIMER_MODE_REL_PINNED);
+}
+
+static int oprofile_hrtimer_start(void)
 {
-        oprofile_add_sample(regs, 0);
+        on_each_cpu(__oprofile_hrtimer_start, NULL, 1);
         return 0;
 }
 
-static int timer_start(void)
+static void __oprofile_hrtimer_stop(int cpu)
 {
-        return register_timer_hook(timer_notify);
+        struct hrtimer *hrtimer = &per_cpu(oprofile_hrtimer, cpu);
+
+        hrtimer_cancel(hrtimer);
 }
 
+static void oprofile_hrtimer_stop(void)
+{
+        int cpu;
+
+        for_each_online_cpu(cpu)
+                __oprofile_hrtimer_stop(cpu);
+}
 
-static void timer_stop(void)
+static int __cpuinit oprofile_cpu_notify(struct notifier_block *self,
+                                         unsigned long action, void *hcpu)
 {
-        unregister_timer_hook(timer_notify);
+        long cpu = (long) hcpu;
+
+        switch (action) {
+        case CPU_ONLINE:
+        case CPU_ONLINE_FROZEN:
+                smp_call_function_single(cpu, __oprofile_hrtimer_start,
+                                         NULL, 1);
+                break;
+        case CPU_DEAD:
+        case CPU_DEAD_FROZEN:
+                __oprofile_hrtimer_stop(cpu);
+                break;
+        }
+        return NOTIFY_OK;
 }
 
+static struct notifier_block __refdata oprofile_cpu_notifier = {
+        .notifier_call = oprofile_cpu_notify,
+};
 
-void __init oprofile_timer_init(struct oprofile_operations *ops)
+int __init oprofile_timer_init(struct oprofile_operations *ops)
 {
+        int rc;
+
+        rc = register_hotcpu_notifier(&oprofile_cpu_notifier);
+        if (rc)
+                return rc;
         ops->create_files = NULL;
         ops->setup = NULL;
         ops->shutdown = NULL;
-        ops->start = timer_start;
-        ops->stop = timer_stop;
+        ops->start = oprofile_hrtimer_start;
+        ops->stop = oprofile_hrtimer_stop;
         ops->cpu_type = "timer";
+        return 0;
+}
+
+void __exit oprofile_timer_exit(void)
+{
+        unregister_hotcpu_notifier(&oprofile_cpu_notifier);
 }