Merge tag 'v4.4-rc2' into drm-intel-next-queued

Linux 4.4-rc2

Backmerge to get at

commit 1b0e3a049efe471c399674fd954500ce97438d30
Author: Imre Deak <imre.deak@intel.com>
Date:   Thu Nov 5 23:04:11 2015 +0200

    drm/i915/skl: disable display side power well support for now

so that we can proplery re-eanble skl power wells in -next.

Conflicts are just adjacent lines changed, except for intel_fbdev.c
where we need to interleave the changs. Nothing nefarious.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h
index 2881145cda86..d801bb0d9f6d 100644
--- a/include/uapi/linux/perf_event.h
+++ b/include/uapi/linux/perf_event.h
@@ -110,6 +110,7 @@ enum perf_sw_ids {
         PERF_COUNT_SW_ALIGNMENT_FAULTS          = 7,
         PERF_COUNT_SW_EMULATION_FAULTS          = 8,
         PERF_COUNT_SW_DUMMY                     = 9,
+        PERF_COUNT_SW_BPF_OUTPUT                = 10,
 
         PERF_COUNT_SW_MAX,                      /* non-ABI */
 };
@@ -168,6 +169,7 @@ enum perf_branch_sample_type_shift {
 
         PERF_SAMPLE_BRANCH_CALL_STACK_SHIFT     = 11, /* call/ret stack */
         PERF_SAMPLE_BRANCH_IND_JUMP_SHIFT       = 12, /* indirect jumps */
+        PERF_SAMPLE_BRANCH_CALL_SHIFT           = 13, /* direct call */
 
         PERF_SAMPLE_BRANCH_MAX_SHIFT            /* non-ABI */
 };
@@ -188,6 +190,7 @@ enum perf_branch_sample_type {
 
         PERF_SAMPLE_BRANCH_CALL_STACK   = 1U << PERF_SAMPLE_BRANCH_CALL_STACK_SHIFT,
         PERF_SAMPLE_BRANCH_IND_JUMP     = 1U << PERF_SAMPLE_BRANCH_IND_JUMP_SHIFT,
+        PERF_SAMPLE_BRANCH_CALL         = 1U << PERF_SAMPLE_BRANCH_CALL_SHIFT,
 
         PERF_SAMPLE_BRANCH_MAX          = 1U << PERF_SAMPLE_BRANCH_MAX_SHIFT,
 };
@@ -476,7 +479,7 @@ struct perf_event_mmap_page {
          *   u64 delta;
          *
          *   quot = (cyc >> time_shift);
-         *   rem = cyc & ((1 << time_shift) - 1);
+         *   rem = cyc & (((u64)1 << time_shift) - 1);
          *   delta = time_offset + quot * time_mult +
          *              ((rem * time_mult) >> time_shift);
          *
@@ -507,7 +510,7 @@ struct perf_event_mmap_page {
          * And vice versa:
          *
          *   quot = cyc >> time_shift;
-         *   rem  = cyc & ((1 << time_shift) - 1);
+         *   rem  = cyc & (((u64)1 << time_shift) - 1);
          *   timestamp = time_zero + quot * time_mult +
          *               ((rem * time_mult) >> time_shift);
          */