fix: jbd2: use the correct print format (v5.4.229)

[lttng-modules.git] / Makefile

diff --git a/Makefile b/Makefile
index 34043cfb93690da4e82c9984d7126d853ad458ab..c6173690da4402147698243c3fb6a3d5bdea5e1f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -80,7 +80,6 @@ ifneq ($(KERNELRELEASE),)
                         wrapper/kallsyms.o \
                         wrapper/irqdesc.o \
                         wrapper/fdtable.o \
-                        wrapper/genhd.o \
                         lttng-wrapper-impl.o
 
   ifneq ($(CONFIG_HAVE_SYSCALL_TRACEPOINTS),)
@@ -148,18 +147,36 @@ KERNELDIR ?= /lib/modules/$(shell uname -r)/build
 PWD := $(shell pwd)
 CFLAGS = $(EXTCFLAGS)
 
+# Experimental bitwise enum defaults to disabled.
+CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM ?= n
+
+# Emulate Kconfig behavior of setting defines for config options.
+LKCPPFLAGS = $(KCPPFLAGS)
+ifeq ($(CONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM),y)
+LKCPPFLAGS += -DCONFIG_LTTNG_EXPERIMENTAL_BITWISE_ENUM=y
+endif
+
 default: modules
 
 modules:
-       $(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m modules
+       $(MAKE) -C $(KERNELDIR) M=$(PWD) \
+               CONFIG_LTTNG=m CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m \
+               KCPPFLAGS='$(LKCPPFLAGS)' \
+               modules
 
 modules_install:
-       $(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m modules_install
+       $(MAKE) -C $(KERNELDIR) M=$(PWD) \
+               CONFIG_LTTNG=m CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m \
+               KCPPFLAGS='$(LKCPPFLAGS)' \
+               modules_install
 
 clean:
        $(MAKE) -C $(KERNELDIR) M=$(PWD) clean
 
 %.i: %.c
-       $(MAKE) -C $(KERNELDIR) M=$(PWD) CONFIG_LTTNG=m CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m $@
+       $(MAKE) -C $(KERNELDIR) M=$(PWD) \
+               CONFIG_LTTNG=m CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m \
+               KCPPFLAGS='$(LKCPPFLAGS)' \
+               $@
 
 endif # KERNELRELEASE