Unverified Commit 49655149 authored by Janik's avatar Janik Committed by GitHub
Browse files

Merge pull request #305018 from j-brn/master 

kvmfr: fix build failure for B7-rc1
parents 3b2b0da2 225a332d

pkgs/os-specific/linux/kvmfr/default.nix

+0 −3
Original line number Diff line number Diff line
@@ -6,9 +6,6 @@ stdenv.mkDerivation { 


  src = looking-glass-client.src;

  sourceRoot = "${looking-glass-client.src.name}/module";

  patches = lib.optional (kernel.kernelAtLeast "6.4") [

    ./linux-6-4-compat.patch

  ];

  hardeningDisable = [ "pic" "format" ];

  nativeBuildInputs = kernel.moduleBuildDependencies;

pkgs/os-specific/linux/kvmfr/linux-6-4-compat.patch

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
diff --git a/kvmfr.c b/kvmfr.c

index 121aae5b..2f4c9e1a 100644

--- a/kvmfr.c

+++ b/kvmfr.c

@@ -539,7 +539,11 @@ static int __init kvmfr_module_init(void)

   if (kvmfr->major < 0)

     goto out_free;

 

+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 4, 0)

   kvmfr->pClass = class_create(THIS_MODULE, KVMFR_DEV_NAME);

+#else

+  kvmfr->pClass = class_create(KVMFR_DEV_NAME);

+#endif

   if (IS_ERR(kvmfr->pClass))

     goto out_unreg;