Index: head/sys/compat/linuxkpi/common/include/asm/byteorder.h
===================================================================
--- head/sys/compat/linuxkpi/common/include/asm/byteorder.h	(revision 299360)
+++ head/sys/compat/linuxkpi/common/include/asm/byteorder.h	(revision 299361)
@@ -1,94 +1,94 @@
 /*-
  * Copyright (c) 2010 Isilon Systems, Inc.
  * Copyright (c) 2010 iX Systems, Inc.
  * Copyright (c) 2010 Panasas, Inc.
  * Copyright (c) 2013, 2014 Mellanox Technologies, Ltd.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice unmodified, this list of conditions, and the following
  *    disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD$
  */
 #ifndef	_ASM_BYTEORDER_H_
 #define	_ASM_BYTEORDER_H_
 
 #include <sys/types.h>
 #include <sys/endian.h>
 #include <asm/types.h>
 
 #if BYTE_ORDER == LITTLE_ENDIAN
 #define	__LITTLE_ENDIAN
 #else
 #define	__BIG_ENDIAN
 #endif
 
 #define	cpu_to_le64	htole64
 #define	le64_to_cpu	le64toh
 #define	cpu_to_le32	htole32
 #define	le32_to_cpu	le32toh
 #define	cpu_to_le16	htole16
 #define	le16_to_cpu	le16toh
 #define	cpu_to_be64	htobe64
 #define	be64_to_cpu	be64toh
 #define	cpu_to_be32	htobe32
 #define	be32_to_cpu	be32toh
 #define	cpu_to_be16	htobe16
 #define	be16_to_cpu	be16toh
 #define	__be16_to_cpu	be16toh
 
 #define	cpu_to_le64p(x)	htole64(*((const uint64_t *)(x)))
 #define	le64_to_cpup(x)	le64toh(*((const uint64_t *)(x)))
 #define	cpu_to_le32p(x)	htole32(*((const uint32_t *)(x)))
 #define	le32_to_cpup(x)	le32toh(*((const uint32_t *)(x)))
 #define	cpu_to_le16p(x)	htole16(*((const uint16_t *)(x)))
 #define	le16_to_cpup(x)	le16toh(*((const uint16_t *)(x)))
 #define	cpu_to_be64p(x)	htobe64(*((const uint64_t *)(x)))
 #define	be64_to_cpup(x)	be64toh(*((const uint64_t *)(x)))
 #define	cpu_to_be32p(x)	htobe32(*((const uint32_t *)(x)))
 #define	be32_to_cpup(x)	be32toh(*((const uint32_t *)(x)))
 #define	cpu_to_be16p(x)	htobe16(*((const uint16_t *)(x)))
 #define	be16_to_cpup(x)	be16toh(*((const uint16_t *)(x)))
 
-#define	cpu_to_le64s(x)	do { *((uint64_t *)x) = cpu_to_le64p((x)) } while (0)
-#define	le64_to_cpus(x)	do { *((uint64_t *)x) = le64_to_cpup((x)) } while (0)
-#define	cpu_to_le32s(x)	do { *((uint32_t *)x) = cpu_to_le32p((x)) } while (0)
-#define	le32_to_cpus(x)	do { *((uint32_t *)x) = le32_to_cpup((x)) } while (0)
-#define	cpu_to_le16s(x)	do { *((uint16_t *)x) = cpu_to_le16p((x)) } while (0)
-#define	le16_to_cpus(x)	do { *((uint16_t *)x) = le16_to_cpup((x)) } while (0)
-#define	cpu_to_be64s(x)	do { *((uint64_t *)x) = cpu_to_be64p((x)) } while (0)
-#define	be64_to_cpus(x)	do { *((uint64_t *)x) = be64_to_cpup((x)) } while (0)
-#define	cpu_to_be32s(x)	do { *((uint32_t *)x) = cpu_to_be32p((x)) } while (0)
-#define	be32_to_cpus(x)	do { *((uint32_t *)x) = be32_to_cpup((x)) } while (0)
-#define	cpu_to_be16s(x)	do { *((uint16_t *)x) = cpu_to_be16p((x)) } while (0)
-#define	be16_to_cpus(x)	do { *((uint16_t *)x) = be16_to_cpup((x)) } while (0)
+#define	cpu_to_le64s(x)	do { *((uint64_t *)(x)) = cpu_to_le64p((x)); } while (0)
+#define	le64_to_cpus(x)	do { *((uint64_t *)(x)) = le64_to_cpup((x)); } while (0)
+#define	cpu_to_le32s(x)	do { *((uint32_t *)(x)) = cpu_to_le32p((x)); } while (0)
+#define	le32_to_cpus(x)	do { *((uint32_t *)(x)) = le32_to_cpup((x)); } while (0)
+#define	cpu_to_le16s(x)	do { *((uint16_t *)(x)) = cpu_to_le16p((x)); } while (0)
+#define	le16_to_cpus(x)	do { *((uint16_t *)(x)) = le16_to_cpup((x)); } while (0)
+#define	cpu_to_be64s(x)	do { *((uint64_t *)(x)) = cpu_to_be64p((x)); } while (0)
+#define	be64_to_cpus(x)	do { *((uint64_t *)(x)) = be64_to_cpup((x)); } while (0)
+#define	cpu_to_be32s(x)	do { *((uint32_t *)(x)) = cpu_to_be32p((x)); } while (0)
+#define	be32_to_cpus(x)	do { *((uint32_t *)(x)) = be32_to_cpup((x)); } while (0)
+#define	cpu_to_be16s(x)	do { *((uint16_t *)(x)) = cpu_to_be16p((x)); } while (0)
+#define	be16_to_cpus(x)	do { *((uint16_t *)(x)) = be16_to_cpup((x)); } while (0)
 
 #define	swab16	bswap16
 #define	swab32	bswap32
 #define	swab64	bswap64
 
 static inline void
 be16_add_cpu(uint16_t *var, uint16_t val)
 { 
 	*var = cpu_to_be16(be16_to_cpu(*var) + val);
 }
 
 #endif	/* _ASM_BYTEORDER_H_ */