X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fprobes%2FKbuild;h=c4273e01643ae575b47e301f48b049e6838a561a;hb=HEAD;hp=eb0de4a87493841ee9817fd35ac9ba240d178a8d;hpb=6687229729b31254fa5774f39ee2d768618b3172;p=lttng-modules.git

diff --git a/src/probes/Kbuild b/src/probes/Kbuild
index eb0de4a8..c4273e01 100644
--- a/src/probes/Kbuild
+++ b/src/probes/Kbuild
@@ -15,7 +15,8 @@ kmem_dep = $(srctree)/mm/slab.h
 kmem_dep_wildcard = $(wildcard $(kmem_dep))
 kmem_dep_check = $(shell \
 if [ \( $(VERSION) -ge 7 \
-   -o \( $(VERSION) -eq 6 -a $(PATCHLEVEL) -ge 0 \) \) -a \
+   -o \( $(VERSION) -eq 6 -a $(PATCHLEVEL) -ge 0 \) \
+   -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -ge 14 -a $(RHEL_API_VERSION) -gt 1622301 \) \) -a \
    -z "$(kmem_dep_wildcard)" ] ; then \
   echo "warn" ; \
 else \
@@ -54,7 +55,8 @@ ifneq ($(CONFIG_KVM),)
           kvm_dep_emulate_wildcard = $(wildcard $(kvm_dep_emulate))
           kvm_dep_emulate_check = $(shell \
           if [ \( $(VERSION) -ge 6 \
-             -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -eq 7 \) \) -a \
+             -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -eq 7 \) \
+             -o \( $(VERSION) -eq 4 -a $(PATCHLEVEL) -eq 18 -a $(RHEL_API_VERSION) -ge 2400000 \) \) -a \
              -z "$(kvm_dep_emulate_wildcard)" ] ; then \
             echo "warn" ; \
           else \
@@ -63,7 +65,8 @@ ifneq ($(CONFIG_KVM),)
           ifeq ($(kvm_dep_emulate_check),ok)
             CFLAGS_lttng-probe-kvm-x86.o += -I$(srctree)/virt/kvm \
                        -I$(srctree)/arch/x86/kvm
-            CFLAGS_lttng-probe-kvm-x86-mmu.o += -I$(srctree)/virt/kvm
+            CFLAGS_lttng-probe-kvm-x86-mmu.o += -I$(srctree)/virt/kvm \
+                       -I$(srctree)/arch/x86/kvm
             obj-$(CONFIG_LTTNG) += lttng-probe-kvm-x86.o
             obj-$(CONFIG_LTTNG) += lttng-probe-kvm-x86-mmu.o
           else # ($(kvm_dep_emulate_check),ok)
@@ -165,7 +168,8 @@ ifneq ($(CONFIG_COMPACTION),)
   compaction_dep_wildcard = $(wildcard $(compaction_dep))
   compaction_dep_check = $(shell \
   if [ \( $(VERSION) -ge 6 \
-     -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -ge 18 \) \) -a \
+     -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -ge 18 \) \
+     -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -ge 14 -a $(RHEL_API_VERSION) -gt 1622301 \) \) -a \
      -z "$(compaction_dep_wildcard)" ] ; then \
     echo "warn" ; \
   else \