@@ -17,6 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <xen/byteswap.h>
#include <xen/init.h>
#include <xen/types.h>
#include <xen/kernel.h>
@@ -27,7 +28,6 @@
#include <xen/virtual_region.h>
#include <asm/alternative.h>
#include <asm/atomic.h>
-#include <asm/byteorder.h>
#include <asm/cpufeature.h>
#include <asm/insn.h>
#include <asm/page.h>
@@ -3,6 +3,7 @@
*/
#include <xen/bitops.h>
+#include <xen/byteswap.h>
#include <xen/errno.h>
#include <xen/lib.h>
#include <xen/livepatch_elf.h>
@@ -11,7 +12,6 @@
#include <xen/vmap.h>
#include <asm/bitops.h>
-#include <asm/byteorder.h>
#include <asm/insn.h>
#include <asm/livepatch.h>
@@ -3,6 +3,7 @@
*
* Copyright (C) 2011 Citrix Systems, Inc.
*/
+#include <xen/byteswap.h>
#include <xen/domain_page.h>
#include <xen/errno.h>
#include <xen/guest_access.h>
@@ -14,7 +15,6 @@
#include <xen/sched.h>
#include <xen/vmap.h>
-#include <asm/byteorder.h>
#include <asm/kernel.h>
#include <asm/setup.h>
@@ -13,10 +13,10 @@
*/
#include <xen/bitops.h>
+#include <xen/byteswap.h>
#include <xen/lib.h>
#include <xen/sched.h>
#include <asm/new_vgic.h>
-#include <asm/byteorder.h>
#include "vgic.h"
#include "vgic-mmio.h"
@@ -21,8 +21,8 @@
#ifndef _ARM_ARM32_IO_H
#define _ARM_ARM32_IO_H
+#include <xen/byteswap.h>
#include <asm/system.h>
-#include <asm/byteorder.h>
static inline void __raw_writeb(u8 val, volatile void __iomem *addr)
{
@@ -20,8 +20,8 @@
#ifndef _ARM_ARM64_IO_H
#define _ARM_ARM64_IO_H
+#include <xen/byteswap.h>
#include <asm/system.h>
-#include <asm/byteorder.h>
#include <asm/alternative.h>
/*
@@ -1,9 +1,9 @@
#ifndef _LIBFDT_ENV_H
#define _LIBFDT_ENV_H
+#include <xen/byteswap.h>
#include <xen/types.h>
#include <xen/string.h>
-#include <asm/byteorder.h>
typedef uint16_t fdt16_t;
typedef uint32_t fdt32_t;
Update to use byteswap.h to swap bytes. No functional change. Signed-off-by: Lin Liu <lin.liu@citrix.com> --- Cc: Stefano Stabellini <sstabellini@kernel.org> Cc: Julien Grall <julien@xen.org> Cc: Volodymyr Babchuk <Volodymyr_Babchuk@epam.com> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Cc: Ross Lagerwall <ross.lagerwall@citrix.com> --- xen/arch/arm/alternative.c | 2 +- xen/arch/arm/arm64/livepatch.c | 2 +- xen/arch/arm/kernel.c | 2 +- xen/arch/arm/vgic/vgic-mmio.c | 2 +- xen/include/asm-arm/arm32/io.h | 2 +- xen/include/asm-arm/arm64/io.h | 2 +- xen/include/xen/libfdt/libfdt_env.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-)