linux-3.18.patch

   1 Since kernel commit 8a9522d2fe compilation fails as kvm_age_page
   2 tracepoint had its signature changed, so update it accordingly.
   3
   4 Tested pointing to kernels:
   5     git reset --hard v3.17; make init/version.o
   6     git reset --hard v3.18-rc1; make init/version.o
   7
   8 Signed-off-by: Andr? Goddard Rosa <andre.goddard at gmail.com>
   9 ---
  10  instrumentation/events/lttng-module/kvm.h | 29 +++++++++++++++++++++++++++++
  11  1 file changed, 29 insertions(+)
  12  mode change 100644 => 100755 instrumentation/events/lttng-module/kvm.h
  13
  14 diff --git a/instrumentation/events/lttng-module/kvm.h b/instrumentation/events/lttng-module/kvm.h
  15 old mode 100644
  16 new mode 100755
  17 index c0d42e2..4f95095
  18 --- a/instrumentation/events/lttng-module/kvm.h
  19 +++ b/instrumentation/events/lttng-module/kvm.h
  20 @@ -232,6 +232,34 @@ LTTNG_TRACEPOINT_EVENT(kvm_fpu,
  21         TP_printk("%s", __print_symbolic(__entry->load, kvm_fpu_load_symbol))
  22  )
  23
  24 +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0))
  25 +
  26 +TRACE_EVENT(kvm_age_page,
  27 +       TP_PROTO(ulong gfn, int level, struct kvm_memory_slot *slot, int ref),
  28 +       TP_ARGS(gfn, level, slot, ref),
  29 +
  30 +       TP_STRUCT__entry(
  31 +               __field(        u64,    hva             )
  32 +               __field(        u64,    gfn             )
  33 +               __field(        u8,     level           )
  34 +               __field(        u8,     referenced      )
  35 +       ),
  36 +
  37 +       TP_fast_assign(
  38 +               tp_assign(gfn, gfn)
  39 +               tp_assign(level, level)
  40 +               tp_assign(hva, ((gfn - slot->base_gfn) <<
  41 +                       PAGE_SHIFT) + slot->userspace_addr)
  42 +               tp_assign(referenced, ref)
  43 +       ),
  44 +
  45 +       TP_printk("hva %llx gfn %llx level %u %s",
  46 +               __entry->hva, __entry->gfn, __entry->level,
  47 +               __entry->referenced ? "YOUNG" : "OLD")
  48 +)
  49 +
  50 +#else
  51 +
  52  TRACE_EVENT(kvm_age_page,
  53         TP_PROTO(ulong hva, struct kvm_memory_slot *slot, int ref),
  54         TP_ARGS(hva, slot, ref),
  55 @@ -254,6 +282,7 @@ LTTNG_TRACEPOINT_EVENT(kvm_age_page,
  56                   __entry->referenced ? "YOUNG" : "OLD")
  57  )
  58  #endif
  59 +#endif
  60
  61  #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38))
  62
  63 --
  64 2.1.3
  65
  66