Merge branch 'linus' into perf/core

Conflicts:
	kernel/hw_breakpoint.c

Merge reason: resolve the conflict.

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

diff --combined kernel/sched.c
index 794819eab9ca6b3a7aff46b388f2231ccf08aa6c,dc85ceb908322cad7196339f4df8dd58c37b1cec..c0d2067f3e0d81bb45c3372bb39358164612f3a6
--- 1/kernel/sched.c
--- 2/kernel/sched.c
+++ b/kernel/sched.c
@@@ -3513,9 -3513,9 +3513,9 @@@ void task_times(struct task_struct *p, 
        rtime = nsecs_to_cputime(p->se.sum_exec_runtime);
  
        if (total) {
-               u64 temp;
+               u64 temp = rtime;
  
-               temp = (u64)(rtime * utime);
+               temp *= utime;
                do_div(temp, total);
                utime = (cputime_t)temp;
        } else
@@@ -3546,9 -3546,9 +3546,9 @@@ void thread_group_times(struct task_str
        rtime = nsecs_to_cputime(cputime.sum_exec_runtime);
  
        if (total) {
-               u64 temp;
+               u64 temp = rtime;
  
-               temp = (u64)(rtime * cputime.utime);
+               temp *= cputime.utime;
                do_div(temp, total);
                utime = (cputime_t)temp;
        } else
@@@ -3584,7 -3584,7 +3584,7 @@@ void scheduler_tick(void
        curr->sched_class->task_tick(rq, curr, 0);
        raw_spin_unlock(&rq->lock);
  
 -      perf_event_task_tick(curr);
 +      perf_event_task_tick();
  
  #ifdef CONFIG_SMP
        rq->idle_at_tick = idle_cpu(cpu);