From c44f49680d9fd397cd5d822e38b5f31412d09bf1 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 23 May 2017 15:43:25 -0400 Subject: [PATCH] Fix: ext3 was completely removed from the kernel in v4.3 Don't display the warning about missing ext3 headers on kernels >= 4.3 See upstream commit e31fb9e00543e5d3c5b686747d3c862bc09b59f3 Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- probes/Kbuild | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/probes/Kbuild b/probes/Kbuild index a4f6b32a..2f6c7c76 100644 --- a/probes/Kbuild +++ b/probes/Kbuild @@ -97,13 +97,15 @@ ifneq ($(CONFIG_EXT3_FS),) ext3_dep = $(srctree)/fs/ext3/*.h ext3_dep_check = $(wildcard $(ext3_dep)) ext3 = $(shell \ - if [ $(VERSION) -ge 4 -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 1 \) ] ; then \ - if [ \( $(VERSION) -ge 4 -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 4 \) \) -a \ - -z "$(ext3_dep_check)" ] ; then \ - echo "warn" ; \ - exit ; \ + if [ $(VERSION) -lt 4 -o \( $(VERSION) -eq 4 -a $(PATCHLEVEL) -lt 3 \) ] ; then \ + if [ $(VERSION) -ge 4 -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 1 \) ] ; then \ + if [ \( $(VERSION) -ge 4 -o \( $(VERSION) -eq 3 -a $(PATCHLEVEL) -ge 4 \) \) -a \ + -z "$(ext3_dep_check)" ] ; then \ + echo "warn" ; \ + exit ; \ + fi; \ + echo "lttng-probe-ext3.o" ; \ fi; \ - echo "lttng-probe-ext3.o" ; \ fi;) ifeq ($(ext3),warn) $(warning Files $(ext3_dep) not found. Probe "ext3" is disabled. Use full kernel source tree to enable it.) -- 2.34.1