3 files changed, 14 insertions, 3 deletions

diff --git a/sys/compat/linuxkpi/common/include/linux/compiler.h b/sys/compat/linuxkpi/common/include/linux/compiler.h
index 90d907dd4d45..4fcd1f9f342b 100644
--- a/sys/compat/linuxkpi/common/include/linux/compiler.h
+++ b/sys/compat/linuxkpi/common/include/linux/compiler.h
@@ -66,9 +66,6 @@
 
 #define	barrier()			__asm__ __volatile__("": : :"memory")
 
-#define	lower_32_bits(n)		((u32)(n))
-#define	upper_32_bits(n)		((u32)(((n) >> 16) >> 16))
-
 #define	WRITE_ONCE(x,v) do {		\
 	barrier();			\
 	(*(volatile __typeof(x) *)(uintptr_t)&(x)) = (v); \
diff --git a/sys/compat/linuxkpi/common/include/linux/kernel.h b/sys/compat/linuxkpi/common/include/linux/kernel.h
index 5e94a5cee28c..8caaf520fd3e 100644
--- a/sys/compat/linuxkpi/common/include/linux/kernel.h
+++ b/sys/compat/linuxkpi/common/include/linux/kernel.h
@@ -57,6 +57,7 @@
 #include <linux/kconfig.h>
 #include <linux/instruction_pointer.h>
 #include <linux/hex.h>
+#include <linux/wordpart.h>
 
 #include <asm/byteorder.h>
 #include <asm/cpufeature.h>
diff --git a/sys/compat/linuxkpi/common/include/linux/wordpart.h b/sys/compat/linuxkpi/common/include/linux/wordpart.h
new file mode 100644
index 000000000000..ce697bbef3b3
--- /dev/null
+++ b/sys/compat/linuxkpi/common/include/linux/wordpart.h
@@ -0,0 +1,13 @@
+/*
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2019 Jean-Sébastien Pédron
+ */
+
+#ifndef	_LINUXKPI_LINUX_WORDPART_H_
+#define	_LINUXKPI_LINUX_WORDPART_H_
+
+#define	lower_32_bits(n)		((u32)(n))
+#define	upper_32_bits(n)		((u32)(((n) >> 16) >> 16))
+
+#endif	/* _LINUXKPI_LINUX_WORDPART_H_ */