mirror of
https://github.com/gentoo-mirror/guru.git
synced 2026-10-12 17:51:11 -04:00
sys-kernel/zenpower3: fix compile erros on kernel 6.16 and up
Closes: https://bugs.gentoo.org/947057 Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte@gmail.com>
This commit is contained in:
2 files changed
+15
-9
No files matched your search
@@ -1,30 +1,36 @@
|
|||||||
From c3f5b941864c978f39e91199abc8b8445924c8b3 Mon Sep 17 00:00:00 2001
|
From 787bf530888d15f78f21cf28c4f32da6c48dc881 Mon Sep 17 00:00:00 2001
|
||||||
From: =?UTF-8?q?Gon=C3=A7alo=20Negrier=20Duarte?=
|
From: =?UTF-8?q?Gon=C3=A7alo=20Negrier=20Duarte?=
|
||||||
<gonegrier.duarte@gmail.com>
|
<gonegrier.duarte@gmail.com>
|
||||||
Date: Tue, 29 Apr 2025 13:47:47 +0100
|
Date: Sat, 16 May 2026 13:59:58 +0100
|
||||||
Subject: [PATCH] Implement amd_pci_dev_to_node_id from Kernel 6.14
|
Subject: [PATCH] Implement amd_pci_dev_to_node_id from Kernel 6.14 and
|
||||||
|
asm/amd/nb.h from kernel 6.16
|
||||||
MIME-Version: 1.0
|
MIME-Version: 1.0
|
||||||
Content-Type: text/plain; charset=UTF-8
|
Content-Type: text/plain; charset=UTF-8
|
||||||
Content-Transfer-Encoding: 8bit
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte@gmail.com>
|
Signed-off-by: Gonçalo Negrier Duarte <gonegrier.duarte@gmail.com>
|
||||||
---
|
---
|
||||||
zenpower.c | 8 ++++++++
|
zenpower.c | 12 ++++++++++++
|
||||||
1 file changed, 8 insertions(+)
|
1 file changed, 12 insertions(+)
|
||||||
|
|
||||||
diff --git a/zenpower.c b/zenpower.c
|
diff --git a/zenpower.c b/zenpower.c
|
||||||
index 6d47732..dedba5c 100644
|
index 6d47732..9f6e7aa 100644
|
||||||
--- a/zenpower.c
|
--- a/zenpower.c
|
||||||
+++ b/zenpower.c
|
+++ b/zenpower.c
|
||||||
@@ -35,6 +35,7 @@
|
@@ -35,7 +35,12 @@
|
||||||
#include <linux/hwmon.h>
|
#include <linux/hwmon.h>
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/pci.h>
|
#include <linux/pci.h>
|
||||||
+#include <linux/version.h>
|
+#include <linux/version.h>
|
||||||
|
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(6, 16, 0)
|
||||||
#include <asm/amd_nb.h>
|
#include <asm/amd_nb.h>
|
||||||
|
+#else
|
||||||
|
+#include <asm/amd/nb.h>
|
||||||
|
+#endif
|
||||||
|
|
||||||
MODULE_DESCRIPTION("AMD ZEN family CPU Sensors Driver");
|
MODULE_DESCRIPTION("AMD ZEN family CPU Sensors Driver");
|
||||||
@@ -150,6 +151,13 @@ static const struct tctl_offset tctl_offset_table[] = {
|
MODULE_AUTHOR("Anthony Wang");
|
||||||
|
@@ -150,6 +155,13 @@ static const struct tctl_offset tctl_offset_table[] = {
|
||||||
static DEFINE_MUTEX(nb_smu_ind_mutex);
|
static DEFINE_MUTEX(nb_smu_ind_mutex);
|
||||||
static bool multicpu = false;
|
static bool multicpu = false;
|
||||||
|
|
||||||
@@ -39,5 +45,5 @@ index 6d47732..dedba5c 100644
|
|||||||
enum hwmon_sensor_types type,
|
enum hwmon_sensor_types type,
|
||||||
u32 attr, int channel)
|
u32 attr, int channel)
|
||||||
--
|
--
|
||||||
2.49.0
|
2.53.0
|
||||||
|
|
||||||
File renamed without changes.
Reference in new issue
Block a user