Merge branch 'perf/urgent' into perf/core
Ingo Molnar [Tue, 5 Oct 2010 07:47:14 +0000 (09:47 +0200)]
Conflicts:
tools/perf/util/ui/browsers/hists.c

Merge reason: fix the conflict and merge in changes for dependent patch.

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

1  2 
arch/arm/oprofile/common.c
arch/x86/kernel/Makefile
arch/x86/kernel/cpu/perf_event.c
arch/x86/kernel/cpu/perf_event_p4.c
tools/perf/Makefile

Simple merge
Simple merge
@@@ -1019,23 -1005,23 +1020,24 @@@ static void x86_pmu_start(struct perf_e
        struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
        int idx = event->hw.idx;
  
 -      if (idx == -1)
 -              return -EAGAIN;
 +      if (WARN_ON_ONCE(!(event->hw.state & PERF_HES_STOPPED)))
 +              return;
 +
 +      if (WARN_ON_ONCE(idx == -1))
 +              return;
 +
 +      if (flags & PERF_EF_RELOAD) {
 +              WARN_ON_ONCE(!(event->hw.state & PERF_HES_UPTODATE));
 +              x86_perf_event_set_period(event);
 +      }
 +
 +      event->hw.state = 0;
  
 -      x86_perf_event_set_period(event);
        cpuc->events[idx] = event;
        __set_bit(idx, cpuc->active_mask);
+       __set_bit(idx, cpuc->running);
        x86_pmu.enable(event);
        perf_event_update_userpage(event);
 -
 -      return 0;
 -}
 -
 -static void x86_pmu_unthrottle(struct perf_event *event)
 -{
 -      int ret = x86_pmu_start(event);
 -      WARN_ON_ONCE(ret);
  }
  
  void perf_event_print_debug(void)
Simple merge
Simple merge