move asm/unaligned.h to linux/unaligned.h

asm/unaligned.h is always an include of asm-generic/unaligned.h; might as well move that thing to linux/unaligned.h and include that - there's nothing arch-specific in that header. auto-generated by the following: for i in `git grep -l -w asm/unaligned.h`; do sed -i -e "s/asm\/unaligned.h/linux\/unaligned.h/" $i done for i in `git grep -l -w asm-generic/unaligned.h`; do sed -i -e "s/asm-generic\/unaligned.h/linux\/unaligned.h/" $i done git mv include/asm-generic/unaligned.h include/linux/unaligned.h git mv tools/include/asm-generic/unaligned.h tools/include/linux/unaligned.h sed -i -e "/unaligned.h/d" include/asm-generic/Kbuild sed -i -e "s/__ASM_GENERIC/__LINUX/" include/linux/unaligned.h tools/include/linux/unaligned.h Acked-by: Vineet Gupta <[email protected]> Signed-off-by: Al Viro <[email protected]> [Louis: backport - strip non-nfp and add compat] Signed-off-by: Louis Peens <[email protected]> Reviewed-by: Ryno Swart <[email protected]>
Netronome · Oct 9, 2024 · 88fcc0e · 88fcc0e
1 parent 07e9682
commit 88fcc0e
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 0 deletions.
diff --git a/src/crypto/ipsec.c b/src/crypto/ipsec.c
@@ -8,7 +8,11 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/netdevice.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0)
 #include <asm/unaligned.h>
+#else
+#include <linux/unaligned.h>
+#endif
 #include <linux/ktime.h>
 #include <net/xfrm.h>
 

diff --git a/src/nfpcore/nfp6000_pcie.c b/src/nfpcore/nfp6000_pcie.c
@@ -15,7 +15,13 @@
  * abstraction builds upon this BAR interface.
  */
 
+#include "nfpcore/kcompat.h"
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0)
 #include <asm/unaligned.h>
+#else
+#include <linux/unaligned.h>
+#endif
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/kref.h>

diff --git a/src/nfpcore/nfp_cppcore.c b/src/nfpcore/nfp_cppcore.c
@@ -9,7 +9,13 @@
  *          Rolf Neugebauer <[email protected]>
  */
 
+#include "nfpcore/kcompat.h"
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0)
 #include <asm/unaligned.h>
+#else
+#include <linux/unaligned.h>
+#endif
 #include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/ioport.h>

diff --git a/src/nfpcore/nfp_cpplib.c b/src/nfpcore/nfp_cpplib.c
@@ -10,7 +10,11 @@
  */
 #include "kcompat.h"
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0)
 #include <asm/unaligned.h>
+#else
+#include <linux/unaligned.h>
+#endif
 #if VER_NON_RHEL_GE(4, 9) || VER_RHEL_GE(7, 5)
 #include <linux/bitfield.h>
 #endif

diff --git a/src/nfpcore/nfp_hwinfo.c b/src/nfpcore/nfp_hwinfo.c
@@ -14,8 +14,14 @@
  *   (ie, in this example, ME 39 has been reserved by boardconfig.)
  */
 
+#include "nfpcore/kcompat.h"
+
 #include <asm/byteorder.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0)
 #include <asm/unaligned.h>
+#else
+#include <linux/unaligned.h>
+#endif
 #include <linux/delay.h>
 #include <linux/log2.h>
 #include <linux/kernel.h>

diff --git a/src/nfpcore/nfp_nsp.c b/src/nfpcore/nfp_nsp.c
@@ -8,7 +8,11 @@
  */
 #include "kcompat.h"
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0)
 #include <asm/unaligned.h>
+#else
+#include <linux/unaligned.h>
+#endif
 #if VER_NON_RHEL_GE(4, 9) || VER_RHEL_GE(7, 5)
 #include <linux/bitfield.h>
 #endif

diff --git a/src/nfpcore/nfp_rtsym.c b/src/nfpcore/nfp_rtsym.c
@@ -11,7 +11,12 @@
  */
 #include "kcompat.h"
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0)
 #include <asm/unaligned.h>
+#else
+#include <linux/unaligned.h>
+#endif
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/slab.h>