diff --git a/pkgs/amd-uprof/driver.nix b/pkgs/amd-uprof/driver.nix index 716e0d4e..dc0d86df 100644 --- a/pkgs/amd-uprof/driver.nix +++ b/pkgs/amd-uprof/driver.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { ''; hardeningDisable = [ "pic" "format" ]; nativeBuildInputs = kernel.moduleBuildDependencies; - patches = [ ./makefile.patch ./hrtimer.patch ]; + patches = [ ./makefile.patch ./hrtimer.patch ./remove-wr-rdmsrq.patch ]; makeFlags = [ "KERNEL_VERSION=${kernel.modDirVersion}" "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" diff --git a/pkgs/amd-uprof/remove-wr-rdmsrq.patch b/pkgs/amd-uprof/remove-wr-rdmsrq.patch new file mode 100644 index 00000000..54d48e6a --- /dev/null +++ b/pkgs/amd-uprof/remove-wr-rdmsrq.patch @@ -0,0 +1,20 @@ +diff --git a/inc/PwrProfAsm.h b/inc/PwrProfAsm.h +index d77770a..c93a0e9 100644 +--- a/inc/PwrProfAsm.h ++++ b/inc/PwrProfAsm.h +@@ -347,6 +347,7 @@ + + #endif + ++/* + #define rdmsrq(msr,val1,val2,val3,val4) ({ \ + __asm__ __volatile__( \ + "rdmsr\n" \ +@@ -362,6 +363,7 @@ + :"c"(msr), "a"(val1), "d"(val2), "S"(val3), "D"(val4) \ + ); \ + }) ++*/ + + #define rdmsrpw(msr,val1,val2,val3,val4) ({ \ + __asm__ __volatile__( \