15 files changed, 44 insertions, 44 deletions

diff --git a/sys/compat/linuxkpi/common/include/asm/atomic-long.h b/sys/compat/linuxkpi/common/include/asm/atomic-long.h
index c80c348f95f9..f8bd9edfccf9 100644
--- a/sys/compat/linuxkpi/common/include/asm/atomic-long.h
+++ b/sys/compat/linuxkpi/common/include/asm/atomic-long.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_ATOMIC_LONG_H_
-#define	_ATOMIC_LONG_H_
+#ifndef	_LINUXKPI_ASM_ATOMIC_LONG_H_
+#define	_LINUXKPI_ASM_ATOMIC_LONG_H_
 
 #include <linux/compiler.h>
 #include <sys/types.h>
@@ -130,4 +130,4 @@ atomic_long_dec_and_test(atomic_long_t *v)
 	return i == 0 ;
 }
 
-#endif	/* _ATOMIC_LONG_H_ */
+#endif	/* _LINUXKPI_ASM_ATOMIC_LONG_H_ */
diff --git a/sys/compat/linuxkpi/common/include/asm/atomic.h b/sys/compat/linuxkpi/common/include/asm/atomic.h
index 5cdfbe674ef3..8c201ad6a101 100644
--- a/sys/compat/linuxkpi/common/include/asm/atomic.h
+++ b/sys/compat/linuxkpi/common/include/asm/atomic.h
@@ -29,8 +29,8 @@
  * $FreeBSD$
  */
 
-#ifndef _ASM_ATOMIC_H_
-#define	_ASM_ATOMIC_H_
+#ifndef _LINUXKPI_ASM_ATOMIC_H_
+#define	_LINUXKPI_ASM_ATOMIC_H_
 
 #include <linux/compiler.h>
 #include <sys/types.h>
@@ -317,4 +317,4 @@ LINUX_ATOMIC_FETCH_OP(and, &)
 LINUX_ATOMIC_FETCH_OP(andnot, &~)
 LINUX_ATOMIC_FETCH_OP(xor, ^)
 
-#endif					/* _ASM_ATOMIC_H_ */
+#endif					/* _LINUXKPI_ASM_ATOMIC_H_ */
diff --git a/sys/compat/linuxkpi/common/include/asm/atomic64.h b/sys/compat/linuxkpi/common/include/asm/atomic64.h
index b8b87bb2c685..b53063620bb2 100644
--- a/sys/compat/linuxkpi/common/include/asm/atomic64.h
+++ b/sys/compat/linuxkpi/common/include/asm/atomic64.h
@@ -25,8 +25,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_ASM_ATOMIC64_H_
-#define	_ASM_ATOMIC64_H_
+#ifndef	_LINUXKPI_ASM_ATOMIC64_H_
+#define	_LINUXKPI_ASM_ATOMIC64_H_
 
 #include <linux/compiler.h>
 #include <sys/types.h>
@@ -145,4 +145,4 @@ atomic64_cmpxchg(atomic64_t *v, int64_t old, int64_t new)
 	return (ret);
 }
 
-#endif					/* _ASM_ATOMIC64_H_ */
+#endif					/* _LINUXKPI_ASM_ATOMIC64_H_ */
diff --git a/sys/compat/linuxkpi/common/include/asm/barrier.h b/sys/compat/linuxkpi/common/include/asm/barrier.h
index 10aa24a7ae8b..12b4736e1939 100644
--- a/sys/compat/linuxkpi/common/include/asm/barrier.h
+++ b/sys/compat/linuxkpi/common/include/asm/barrier.h
@@ -25,8 +25,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _ASM_BARRIER_H_
-#define	_ASM_BARRIER_H_
+#ifndef _LINUXKPI_ASM_BARRIER_H_
+#define	_LINUXKPI_ASM_BARRIER_H_
 
 #include <sys/types.h>
 #include <machine/atomic.h>
@@ -55,4 +55,4 @@
 #define	smp_store_mb(x, v)	do { WRITE_ONCE(x, v); smp_mb(); } while (0)
 #endif
 
-#endif	/* _ASM_BARRIER_H_ */
+#endif	/* _LINUXKPI_ASM_BARRIER_H_ */
diff --git a/sys/compat/linuxkpi/common/include/asm/byteorder.h b/sys/compat/linuxkpi/common/include/asm/byteorder.h
index 05e39bb52149..19961303596e 100644
--- a/sys/compat/linuxkpi/common/include/asm/byteorder.h
+++ b/sys/compat/linuxkpi/common/include/asm/byteorder.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_ASM_BYTEORDER_H_
-#define	_ASM_BYTEORDER_H_
+#ifndef	_LINUXKPI_ASM_BYTEORDER_H_
+#define	_LINUXKPI_ASM_BYTEORDER_H_
 
 #include <sys/types.h>
 #include <sys/endian.h>
@@ -157,4 +157,4 @@ le16_add_cpu(uint16_t *var, uint16_t val)
 	*var = cpu_to_le16(le16_to_cpu(*var) + val);
 }
 
-#endif	/* _ASM_BYTEORDER_H_ */
+#endif	/* _LINUXKPI_ASM_BYTEORDER_H_ */
diff --git a/sys/compat/linuxkpi/common/include/asm/cpufeature.h b/sys/compat/linuxkpi/common/include/asm/cpufeature.h
index 049088648aa3..84ab86af33dd 100644
--- a/sys/compat/linuxkpi/common/include/asm/cpufeature.h
+++ b/sys/compat/linuxkpi/common/include/asm/cpufeature.h
@@ -1,7 +1,7 @@
 /* Public domain. */
 
-#ifndef _ASM_CPUFEATURE_H
-#define _ASM_CPUFEATURE_H
+#ifndef _LINUXKPI_ASM_CPUFEATURE_H
+#define _LINUXKPI_ASM_CPUFEATURE_H
 
 #if defined(__amd64__) || defined(__i386__)
 
diff --git a/sys/compat/linuxkpi/common/include/asm/fcntl.h b/sys/compat/linuxkpi/common/include/asm/fcntl.h
index f24624e6eeed..2d0285e977e0 100644
--- a/sys/compat/linuxkpi/common/include/asm/fcntl.h
+++ b/sys/compat/linuxkpi/common/include/asm/fcntl.h
@@ -28,9 +28,9 @@
  *
  * $FreeBSD$
  */
-#ifndef _ASM_FCNTL_H_
-#define	_ASM_FCNTL_H_
+#ifndef _LINUXKPI_ASM_FCNTL_H_
+#define	_LINUXKPI_ASM_FCNTL_H_
 
 #include <sys/fcntl.h>
 
-#endif	/* _ASM_FCNTL_H_ */
+#endif	/* _LINUXKPI_ASM_FCNTL_H_ */
diff --git a/sys/compat/linuxkpi/common/include/asm/fpu/api.h b/sys/compat/linuxkpi/common/include/asm/fpu/api.h
index 9c63b2e972bf..133754abdc4b 100644
--- a/sys/compat/linuxkpi/common/include/asm/fpu/api.h
+++ b/sys/compat/linuxkpi/common/include/asm/fpu/api.h
@@ -25,8 +25,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef	_FPU_API_H_
-#define	_FPU_API_H_
+#ifndef	_LINUXKPI_ASM_FPU_API_H_
+#define	_LINUXKPI_ASM_FPU_API_H_
 
 #define	kernel_fpu_begin() \
    lkpi_kernel_fpu_begin()
@@ -37,4 +37,4 @@
 extern void lkpi_kernel_fpu_begin(void);
 extern void lkpi_kernel_fpu_end(void);
 
-#endif /* _FPU_API_H_ */
+#endif /* _LINUXKPI_ASM_FPU_API_H_ */
diff --git a/sys/compat/linuxkpi/common/include/asm/io.h b/sys/compat/linuxkpi/common/include/asm/io.h
index 24d350f4743e..49eca70a38eb 100644
--- a/sys/compat/linuxkpi/common/include/asm/io.h
+++ b/sys/compat/linuxkpi/common/include/asm/io.h
@@ -28,9 +28,9 @@
  *
  * $FreeBSD$
  */
-#ifndef _ASM_IO_H_
-#define _ASM_IO_H_
+#ifndef _LINUXKPI_ASM_IO_H_
+#define _LINUXKPI_ASM_IO_H_
 
 #include <linux/io.h>
 
-#endif	/* _ASM_IO_H_ */
+#endif	/* _LINUXKPI_ASM_IO_H_ */
diff --git a/sys/compat/linuxkpi/common/include/asm/msr.h b/sys/compat/linuxkpi/common/include/asm/msr.h
index 1697c20767a5..9d23e6b1bbc7 100644
--- a/sys/compat/linuxkpi/common/include/asm/msr.h
+++ b/sys/compat/linuxkpi/common/include/asm/msr.h
@@ -26,12 +26,12 @@
  * $FreeBSD$
  */
 
-#ifndef _ASM_MSR_H_
-#define	_ASM_MSR_H_
+#ifndef _LINUXKPI_ASM_MSR_H_
+#define	_LINUXKPI_ASM_MSR_H_
 
 #include <machine/cpufunc.h>
 
 #define	rdmsrl(msr, val)	((val) = rdmsr(msr))
 #define	rdmsrl_safe(msr, val)	rdmsr_safe(msr, val)
 
-#endif /* _ASM_MSR_H_ */
+#endif /* _LINUXKPI_ASM_MSR_H_ */
diff --git a/sys/compat/linuxkpi/common/include/asm/pgtable.h b/sys/compat/linuxkpi/common/include/asm/pgtable.h
index 4831c144888d..9e66fab8eae4 100644
--- a/sys/compat/linuxkpi/common/include/asm/pgtable.h
+++ b/sys/compat/linuxkpi/common/include/asm/pgtable.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef _ASM_PGTABLE_H_
-#define	_ASM_PGTABLE_H_
+#ifndef _LINUXKPI_ASM_PGTABLE_H_
+#define	_LINUXKPI_ASM_PGTABLE_H_
 
 #include <linux/page.h>
 
@@ -42,4 +42,4 @@ typedef struct page *pgtable_t;
 
 #define	pgprot_decrypted(prot)	(prot)
 
-#endif	/* _ASM_PGTABLE_H_ */
+#endif	/* _LINUXKPI_ASM_PGTABLE_H_ */
diff --git a/sys/compat/linuxkpi/common/include/asm/smp.h b/sys/compat/linuxkpi/common/include/asm/smp.h
index dd25b02115a8..c349edb16bf4 100644
--- a/sys/compat/linuxkpi/common/include/asm/smp.h
+++ b/sys/compat/linuxkpi/common/include/asm/smp.h
@@ -26,8 +26,8 @@
  * $FreeBSD$
  */
 
-#ifndef _ASM_SMP_H_
-#define	_ASM_SMP_H_
+#ifndef _LINUXKPI_ASM_SMP_H_
+#define	_LINUXKPI_ASM_SMP_H_
 
 #if defined(__i386__) || defined(__amd64__)
 
@@ -45,4 +45,4 @@ int	linux_wbinvd_on_all_cpus(void);
 #define	put_cpu()			\
 	critical_exit()
 
-#endif /* _ASM_SMP_H_ */
+#endif /* _LINUXKPI_ASM_SMP_H_ */
diff --git a/sys/compat/linuxkpi/common/include/asm/types.h b/sys/compat/linuxkpi/common/include/asm/types.h
index daa5d83616a2..e7d3de60e987 100644
--- a/sys/compat/linuxkpi/common/include/asm/types.h
+++ b/sys/compat/linuxkpi/common/include/asm/types.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef	_ASM_TYPES_H_
-#define	_ASM_TYPES_H_
+#ifndef	_LINUXKPI_ASM_TYPES_H_
+#define	_LINUXKPI_ASM_TYPES_H_
 
 #if defined(_KERNEL) || defined(_STANDALONE)
 
@@ -61,4 +61,4 @@ typedef unsigned short umode_t;
 
 #endif	/* _KERNEL || _STANDALONE */
 
-#endif	/* _ASM_TYPES_H_ */
+#endif	/* _LINUXKPI_ASM_TYPES_H_ */
diff --git a/sys/compat/linuxkpi/common/include/asm/uaccess.h b/sys/compat/linuxkpi/common/include/asm/uaccess.h
index 102373634ba3..6994b48d071e 100644
--- a/sys/compat/linuxkpi/common/include/asm/uaccess.h
+++ b/sys/compat/linuxkpi/common/include/asm/uaccess.h
@@ -28,8 +28,8 @@
  *
  * $FreeBSD$
  */
-#ifndef _ASM_UACCESS_H_
-#define _ASM_UACCESS_H_
+#ifndef _LINUXKPI_ASM_UACCESS_H_
+#define _LINUXKPI_ASM_UACCESS_H_
 
 #include <linux/uaccess.h>
 
@@ -65,4 +65,4 @@ copy_from_user(void *to, const void *from, unsigned long n)
 		goto err; \
 } while (0)
 
-#endif	/* _ASM_UACCESS_H_ */
+#endif	/* _LINUXKPI_ASM_UACCESS_H_ */
diff --git a/sys/compat/linuxkpi/common/include/asm/unaligned.h b/sys/compat/linuxkpi/common/include/asm/unaligned.h
index 7597f00f7596..9a788c965653 100644
--- a/sys/compat/linuxkpi/common/include/asm/unaligned.h
+++ b/sys/compat/linuxkpi/common/include/asm/unaligned.h
@@ -30,8 +30,8 @@
  * $FreeBSD$
  */
 
-#ifndef	_ASM_UNALIGNED_H
-#define	_ASM_UNALIGNED_H
+#ifndef	_LINUXKPI_ASM_UNALIGNED_H
+#define	_LINUXKPI_ASM_UNALIGNED_H
 
 #include <linux/types.h>
 #include <asm/byteorder.h>
@@ -75,4 +75,4 @@ get_unaligned_be32(const void *p)
 	return (be32_to_cpup((const __be32 *)p));
 }
 
-#endif	/* _ASM_UNALIGNED_H */
+#endif	/* _LINUXKPI_ASM_UNALIGNED_H */