Merge branch 'linus' into perf/core

Merge reason: pick up fixes that are upstream, we need them
              because we'll apply dependent patches.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

3 files changed, 5 insertions, 7 deletions

diff --git a/kernel/events/callchain.c b/kernel/events/callchain.c
index 057e24b665cf..6581a040f399 100644
--- a/kernel/events/callchain.c
+++ b/kernel/events/callchain.c
@@ -115,8 +115,6 @@ int get_callchain_buffers(void)
         }
 
         err = alloc_callchain_buffers();
-        if (err)
-                release_callchain_buffers();
 exit:
         mutex_unlock(&callchain_mutex);
 
diff --git a/kernel/events/core.c b/kernel/events/core.c
index a8f4ac001a00..32b48c889711 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -815,7 +815,7 @@ static void update_event_times(struct perf_event *event)
          * here.
          */
         if (is_cgroup_event(event))
-                run_end = perf_event_time(event);
+                run_end = perf_cgroup_event_time(event);
         else if (ctx->is_active)
                 run_end = ctx->time;
         else
diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c
index 88f17b8a3b1d..a58ac285fc69 100644
--- a/kernel/rcutorture.c
+++ b/kernel/rcutorture.c
@@ -56,8 +56,8 @@ static int nreaders = -1;	/* # reader threads, defaults to 2*ncpus */
 static int nfakewriters = 4;    /* # fake writer threads */
 static int stat_interval;       /* Interval between stats, in seconds. */
                                 /*  Defaults to "only at end of test". */
-static int verbose;             /* Print more debug info. */
-static int test_no_idle_hz;     /* Test RCU's support for tickless idle CPUs. */
+static bool verbose;            /* Print more debug info. */
+static bool test_no_idle_hz;    /* Test RCU's support for tickless idle CPUs. */
 static int shuffle_interval = 3; /* Interval between shuffles (in sec)*/
 static int stutter = 5;         /* Start/stop testing interval (in sec) */
 static int irqreader = 1;       /* RCU readers from irq (timers). */
@@ -1399,7 +1399,7 @@ rcu_torture_shutdown(void *arg)
  * Execute random CPU-hotplug operations at the interval specified
  * by the onoff_interval.
  */
-static int
+static int __cpuinit
 rcu_torture_onoff(void *arg)
 {
         int cpu;
@@ -1447,7 +1447,7 @@ rcu_torture_onoff(void *arg)
         return 0;
 }
 
-static int
+static int __cpuinit
 rcu_torture_onoff_init(void)
 {
         if (onoff_interval <= 0)