[lttng-dev] lttng-modules build broken against linux 4.9.x

[Bjørn Forsman]

Hi LTTng devs,

NixOS recently upgraded the stable linux kernel from 4.9.76 to 4.9.77
and with that lttng-modules no longer build. See build error below my
signature.

-- 
Best regards,
Bjørn Forsman

  CC [M]  /tmp/nix-build-lttng-modules-2.10.4-4.9.77.drv-0/lttng-modules-2.10.4/probes/lttng-probe-kvm-x86-mmu.o
In file included from
/tmp/nix-build-lttng-modules-2.10.4-4.9.77.drv-0/lttng-modules-2.10.4/probes/../probes/define_trace.h:100:0,
                 from
/tmp/nix-build-lttng-modules-2.10.4-4.9.77.drv-0/lttng-modules-2.10.4/probes/../instrumentation/events/lttng-module/kvm.h:238,
                 from
/tmp/nix-build-lttng-modules-2.10.4-4.9.77.drv-0/lttng-modules-2.10.4/probes/lttng-probe-kvm.c:42:
/tmp/nix-build-lttng-modules-2.10.4-4.9.77.drv-0/lttng-modules-2.10.4/probes/../probes/lttng-tracepoint-event-impl.h:142:6:
error: conflicting types for 'trace_kvm_mmio'
 void trace_##_name(_proto);
      ^
/tmp/nix-build-lttng-modules-2.10.4-4.9.77.drv-0/lttng-modules-2.10.4/probes/../probes/lttng-tracepoint-event-impl.h:54:2:
note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP'
  LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(map, name, map, PARAMS(proto),
PARAMS(args))
  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/tmp/nix-build-lttng-modules-2.10.4-4.9.77.drv-0/lttng-modules-2.10.4/probes/../probes/lttng-tracepoint-event-impl.h:96:2:
note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT_MAP'
  LTTNG_TRACEPOINT_EVENT_MAP(name, name,    \
  ^~~~~~~~~~~~~~~~~~~~~~~~~~
/tmp/nix-build-lttng-modules-2.10.4-4.9.77.drv-0/lttng-modules-2.10.4/probes/../instrumentation/events/lttng-module/kvm.h:87:1:
note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT'
 LTTNG_TRACEPOINT_EVENT(kvm_mmio,
 ^~~~~~~~~~~~~~~~~~~~~~
In file included from
/nix/store/sxcjxgk13mlkhyma0arv4izamf065vhf-linux-4.9.77-dev/lib/modules/4.9.77/source/arch/x86/include/asm/kvm_host.h:17:0,
                 from
/nix/store/sxcjxgk13mlkhyma0arv4izamf065vhf-linux-4.9.77-dev/lib/modules/4.9.77/source/include/linux/kvm_host.h:36,
                 from
/tmp/nix-build-lttng-modules-2.10.4-4.9.77.drv-0/lttng-modules-2.10.4/probes/lttng-probe-kvm.c:24:
/nix/store/sxcjxgk13mlkhyma0arv4izamf065vhf-linux-4.9.77-dev/lib/modules/4.9.77/source/include/linux/tracepoint.h:183:21:
note: previous definition of 'trace_kvm_mmio' was here
  static inline void trace_##name(proto)    \
                     ^
/nix/store/sxcjxgk13mlkhyma0arv4izamf065vhf-linux-4.9.77-dev/lib/modules/4.9.77/source/include/linux/tracepoint.h:348:2:
note: in expansion of macro '__DECLARE_TRACE'
  __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args),  \
  ^~~~~~~~~~~~~~~
/nix/store/sxcjxgk13mlkhyma0arv4izamf065vhf-linux-4.9.77-dev/lib/modules/4.9.77/source/include/linux/tracepoint.h:484:2:
note: in expansion of macro 'DECLARE_TRACE'
  DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
  ^~~~~~~~~~~~~
/nix/store/sxcjxgk13mlkhyma0arv4izamf065vhf-linux-4.9.77-dev/lib/modules/4.9.77/source/include/trace/events/kvm.h:210:1:
note: in expansion of macro 'TRACE_EVENT'
 TRACE_EVENT(kvm_mmio,
 ^~~~~~~~~~~
make[5]: *** [/nix/store/sxcjxgk13mlkhyma0arv4izamf065vhf-linux-4.9.77-dev/lib/modules/4.9.77/source/scripts/Makefile.build:299:
/tmp/nix-build-lttng-modules-2.10.4-4.9.77.drv-0/lttng-modules-2.10.4/probes/lttng-probe-kvm.o]
Error 1
make[5]: *** Waiting for unfinished jobs....
make[4]: *** [/nix/store/sxcjxgk13mlkhyma0arv4izamf065vhf-linux-4.9.77-dev/lib/modules/4.9.77/source/scripts/Makefile.build:544:
/tmp/nix-build-lttng-modules-2.10.4-4.9.77.drv-0/lttng-modules-2.10.4/probes]
Error 2
make[4]: *** Waiting for unfinished jobs....
make[3]: *** [/nix/store/sxcjxgk13mlkhyma0arv4izamf065vhf-linux-4.9.77-dev/lib/modules/4.9.77/source/Makefile:1497:
_module_/tmp/nix-build-lttng-modules-2.10.4-4.9.77.drv-0/lttng-modules-2.10.4]
Error 2
make[2]: *** [Makefile:150: sub-make] Error 2
make[1]: *** [Makefile:24: __sub-make] Error 2
make[1]: Leaving directory
'/nix/store/sxcjxgk13mlkhyma0arv4izamf065vhf-linux-4.9.77-dev/lib/modules/4.9.77/build'
make: *** [Makefile:110: modules] Error 2
builder for ‘/nix/store/40skfw5a9jpm60l7n3sznnmmsvr2ymwy-lttng-modules-2.10.4-4.9.77.drv’
failed with exit code 2
error: build of
‘/nix/store/40skfw5a9jpm60l7n3sznnmmsvr2ymwy-lttng-modules-2.10.4-4.9.77.drv’
failed