]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
perf/x86/intel: Fix build warning in intel_pmu_drain_pebs_nhm()
authorPeter Zijlstra <peterz@infradead.org>
Fri, 20 Sep 2013 11:08:50 +0000 (13:08 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 20 Sep 2013 11:15:27 +0000 (13:15 +0200)
Fengguang Wu reported this build warning:

    arch/x86/kernel/cpu/perf_event_intel_ds.c: In function 'intel_pmu_drain_pebs_nhm':
    arch/x86/kernel/cpu/perf_event_intel_ds.c:964:2: warning: format '%ld' expects argument of type 'long int', but argument 4 has type 'int'

Because pointer arithmetics result type is bitness dependent there's no natural
type to use here, cast it to long.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/n/tip-jbpauwxJqtf24luewcsdFith@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/cpu/perf_event_intel_ds.c

index 655d591b57a09a3eec8ab5867467a58c0df23914..54ff6ce519c1d58f62b8f0498bd739b455c4f799 100644 (file)
@@ -963,7 +963,7 @@ static void intel_pmu_drain_pebs_nhm(struct pt_regs *iregs)
         */
        WARN_ONCE(top - at > x86_pmu.max_pebs_events * x86_pmu.pebs_record_size,
                  "Unexpected number of pebs records %ld\n",
-                 (top - at) / x86_pmu.pebs_record_size);
+                 (long)(top - at) / x86_pmu.pebs_record_size);
 
        for (; at < top; at += x86_pmu.pebs_record_size) {
                struct pebs_record_nhm *p = at;