kernel-6.6.patch

   1 From 6be48c9f6a32cdcab9824aaad0c19f92222633c4 Mon Sep 17 00:00:00 2001
   2 From: Kienan Stewart <kstewart@efficios.com>
   3 Date: Tue, 26 Sep 2023 14:45:09 -0400
   4 Subject: [PATCH] fix: lttng-probe-kvm-x86-mmu build with linux 6.6
   5
   6 A small change was made upstream in `spte.h` that requires
   7 `arch/x86/kvm` to be added to the search path when
   8 building lttng-probe-kvm.x86-mmu.o.
   9
  10 See upstream commit :
  11
  12   commit d10f3780bc2f80744d291e118c0c8bade54ed3b8
  13   Author: Sean Christopherson <seanjc@google.com>
  14   Date:   Tue Aug 8 15:40:59 2023 -0700
  15
  16       KVM: x86/mmu: Include mmu.h in spte.h
  17
  18       Explicitly include mmu.h in spte.h instead of relying on the "parent" to
  19       include mmu.h.  spte.h references a variety of macros and variables that
  20       are defined/declared in mmu.h, and so including spte.h before (or instead
  21       of) mmu.h will result in build errors, e.g.
  22
  23 Signed-off-by: Kienan Stewart <kstewart@efficios.com>
  24 Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  25 Change-Id: I5c3fc87d3b006cefbcca198e6e15868a342cb8dd
  26 ---
  27  src/probes/Kbuild | 3 ++-
  28  1 file changed, 2 insertions(+), 1 deletion(-)
  29
  30 diff --git a/src/probes/Kbuild b/src/probes/Kbuild
  31 index eb0de4a8..73a15844 100644
  32 --- a/src/probes/Kbuild
  33 +++ b/src/probes/Kbuild
  34 @@ -63,7 +63,8 @@ ifneq ($(CONFIG_KVM),)
  35            ifeq ($(kvm_dep_emulate_check),ok)
  36              CFLAGS_lttng-probe-kvm-x86.o += -I$(srctree)/virt/kvm \
  37                         -I$(srctree)/arch/x86/kvm
  38 -            CFLAGS_lttng-probe-kvm-x86-mmu.o += -I$(srctree)/virt/kvm
  39 +            CFLAGS_lttng-probe-kvm-x86-mmu.o += -I$(srctree)/virt/kvm \
  40 +                       -I$(srctree)/arch/x86/kvm
  41              obj-$(CONFIG_LTTNG) += lttng-probe-kvm-x86.o
  42              obj-$(CONFIG_LTTNG) += lttng-probe-kvm-x86-mmu.o
  43            else # ($(kvm_dep_emulate_check),ok)