pyrox.dev
1From ab1b34848097587aca1f248958358ddb1dc90917 Mon Sep 17 00:00:00 2001
2From: mfrischknecht <manuel.frischknecht@gmail.com>
3Date: Sat, 23 Nov 2024 23:43:53 +0100
4Subject: [PATCH 1/2] Import `unaligned.h` from `linux`
5
6`asm/unaligned.h` has been moved to `linux/unaligned.h` since Linux v. 6.12.
7C.f. e.g. https://github.com/torvalds/linux/commit/5f60d5f6bbc12e782fac78110b0ee62698f3b576
8---
9 src/amd/amdgpu/atom.c | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/src/amd/amdgpu/atom.c b/src/amd/amdgpu/atom.c
13index 333961f..d14c849 100644
14--- a/src/amd/amdgpu/atom.c
15+++ b/src/amd/amdgpu/atom.c
16@@ -29,7 +29,7 @@
17 #include <linux/slab.h>
18 #include <linux/delay.h>
19 #include <linux/version.h>
20-#include <asm/unaligned.h>
21+#include <linux/unaligned.h>
22
23 //#include <drm/drm_util.h>
24 //#include <drm/drm_print.h>
25
26From 54ffd6a012e7567b0288bc5fcc3678b545bd5aec Mon Sep 17 00:00:00 2001
27From: mfrischknecht <manuel.frischknecht@gmail.com>
28Date: Wed, 27 Nov 2024 07:09:37 +0100
29Subject: [PATCH 2/2] Make new include path conditional
30MIME-Version: 1.0
31Content-Type: text/plain; charset=UTF-8
32Content-Transfer-Encoding: 8bit
33
34…so the module builds for both kernels below 6.12 and above. Thanks, @VoodaGod!
35
36Co-authored-by: Jason Rensburger <l33tjas.0n@gmail.com>
37---
38 src/amd/amdgpu/atom.c | 4 ++++
39 1 file changed, 4 insertions(+)
40
41diff --git a/src/amd/amdgpu/atom.c b/src/amd/amdgpu/atom.c
42index d14c849..36d45ff 100644
43--- a/src/amd/amdgpu/atom.c
44+++ b/src/amd/amdgpu/atom.c
45@@ -29,7 +29,11 @@
46 #include <linux/slab.h>
47 #include <linux/delay.h>
48 #include <linux/version.h>
49+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0)
50+#include <asm/unaligned.h>
51+#else
52 #include <linux/unaligned.h>
53+#endif
54
55 //#include <drm/drm_util.h>
56 //#include <drm/drm_print.h>