Merge branch 'master' into feature/audio_reset

[core] dkms: bump version
[amd] audio: Preserve PCI config space for audio device
2026-03-28 13:12:43 +01:00 · 2021-01-12 21:29:54 -06:00 · 2021-01-12 11:30:38 -06:00 · 2021-01-12 11:30:17 -06:00
3 changed files with 1 additions and 10 deletions
--- a/dkms.conf
+++ b/dkms.conf
@@ -1,5 +1,5 @@
 PACKAGE_NAME="vendor-reset"
-PACKAGE_VERSION="0.1.1"
+PACKAGE_VERSION="0.0.19"
 BUILT_MODULE_NAME[0]="${PACKAGE_NAME}"
 MAKE[0]="make KDIR=${kernel_source_dir}"
 CLEAN="make KDIR=${kernel_source_dir} clean"
--- a/src/ftrace.c
+++ b/src/ftrace.c
@@ -22,7 +22,6 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 #include <linux/ftrace.h>
 #include <linux/kprobes.h>
 #include <linux/pci.h>
-#include <linux/version.h>

 #include "ftrace.h"

@@ -49,15 +48,8 @@ static int resolve_hook_address(struct ftrace_hook *hook)
  return 0;
 }

-#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 11, 0))
 static void notrace fh_trace_thunk(unsigned long ip, unsigned long parent_ip, struct ftrace_ops *ops, struct pt_regs *regs)
 {
-#else
-static void notrace fh_trace_thunk(unsigned long ip, unsigned long parent_ip, struct ftrace_ops *ops, struct ftrace_regs *fregs)
-{
-  struct pt_regs *regs;
-  regs = ftrace_get_regs(fregs);
-#endif
  struct ftrace_hook *hook = to_ftrace_hook(ops);

  if (!within_module(parent_ip, THIS_MODULE))
--- a/src/module.c
+++ b/src/module.c
@@ -53,4 +53,3 @@ module_exit(vendor_reset_exit);
 MODULE_LICENSE("GPL v2");
 MODULE_AUTHOR("Geoffrey McRae <geoff@hostfission.com>");
 MODULE_AUTHOR("Adam Madsen <adam@ajmadsen.com>");
-MODULE_VERSION("0.1.1");
Author	SHA1	Message	Date
Adam Madsen	da933c8f85	Merge branch 'master' into feature/audio_reset	2021-01-12 21:29:54 -06:00
Adam Madsen	b762dc41d5	[core] dkms: bump version	2021-01-12 11:30:38 -06:00
Adam Madsen	e06046d7f8	[amd] audio: Preserve PCI config space for audio device	2021-01-12 11:30:17 -06:00