From bca09eea299f162a27be3f6a59160afe86c8d525 Mon Sep 17 00:00:00 2001
From: Louis Burda <quent.burda@gmail.com>
Date: Wed, 11 Jan 2023 14:04:03 +0100
Subject: Restructuring of kernel changes

---
 cachepc/track.h | 7 ++++---
 cachepc/uapi.h  | 9 ---------
 linux           | 2 +-
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/cachepc/track.h b/cachepc/track.h
index aaf1d33..b5e7f0d 100644
--- a/cachepc/track.h
+++ b/cachepc/track.h
@@ -2,13 +2,14 @@
 
 #include <linux/types.h>
 #include <linux/spinlock_types.h>
-#include <asm/atomic.h>
+#include <linux/srcu.h>
 #include <linux/kvm_types.h>
-#include <asm/kvm_page_track.h>
-
 #include <linux/kvm_host.h>
 #include <linux/pid.h>
 #include <linux/psp-sev.h>
+#include <asm/kvm_page_track.h>
+#include <asm/atomic.h>
+
 
 extern struct kvm* main_vm;
 
diff --git a/cachepc/uapi.h b/cachepc/uapi.h
index a7c9300..6c456ee 100644
--- a/cachepc/uapi.h
+++ b/cachepc/uapi.h
@@ -76,15 +76,6 @@ enum {
 	CPC_TRACK_FULL,
 };
 
-enum kvm_page_track_mode {
-	KVM_PAGE_TRACK_WRITE,
-	KVM_PAGE_TRACK_ACCESS,
-	KVM_PAGE_TRACK_RESET_ACCESS,
-	KVM_PAGE_TRACK_EXEC,
-	KVM_PAGE_TRACK_RESET_EXEC,
-	KVM_PAGE_TRACK_MAX,
-};
-
 struct cpc_track_config {
 	__u64 gfn;
 	__s32 mode;
diff --git a/linux b/linux
index 277af7f..0b71cfe 160000
--- a/linux
+++ b/linux
@@ -1 +1 @@
-Subproject commit 277af7f29adc70fa5963dc06316aeb2e4c75c787
+Subproject commit 0b71cfed297636b3e9889085d757ff5d7edd8453
-- 
cgit v1.2.3-71-gd317