[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen master] Revert "xen: remove asm/unaligned.h"
commit 8fe6219d83fc71ac04100805e726feb720f6a11a Author: Julien Grall <jgrall@xxxxxxxxxx> AuthorDate: Tue Dec 12 15:43:19 2023 +0000 Commit: Julien Grall <jgrall@xxxxxxxxxx> CommitDate: Tue Dec 12 15:43:19 2023 +0000 Revert "xen: remove asm/unaligned.h" This breaks gitlab CI: https://gitlab.com/xen-project/hardware/xen/-/jobs/5733143618 This reverts commit 6619c6f8913a8c7b2b980dd49a430c62ce6ce5ab. --- xen/arch/x86/include/asm/unaligned.h | 6 ++++++ xen/common/lz4/defs.h | 2 +- xen/common/lzo.c | 2 +- xen/common/unlzo.c | 2 +- xen/common/xz/private.h | 2 +- xen/common/zstd/mem.h | 2 +- xen/lib/xxhash32.c | 2 +- xen/lib/xxhash64.c | 2 +- 8 files changed, 13 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/include/asm/unaligned.h b/xen/arch/x86/include/asm/unaligned.h new file mode 100644 index 0000000000..6070801d4a --- /dev/null +++ b/xen/arch/x86/include/asm/unaligned.h @@ -0,0 +1,6 @@ +#ifndef __ASM_UNALIGNED_H__ +#define __ASM_UNALIGNED_H__ + +#include <xen/unaligned.h> + +#endif /* __ASM_UNALIGNED_H__ */ diff --git a/xen/common/lz4/defs.h b/xen/common/lz4/defs.h index 6d81113266..10609f5a53 100644 --- a/xen/common/lz4/defs.h +++ b/xen/common/lz4/defs.h @@ -10,7 +10,7 @@ #ifdef __XEN__ #include <asm/byteorder.h> -#include <xen/unaligned.h> +#include <asm/unaligned.h> #else static inline u16 get_unaligned_le16(const void *p) diff --git a/xen/common/lzo.c b/xen/common/lzo.c index cc03f0f554..a87c76dded 100644 --- a/xen/common/lzo.c +++ b/xen/common/lzo.c @@ -97,7 +97,7 @@ #ifdef __XEN__ #include <xen/lib.h> #include <asm/byteorder.h> -#include <xen/unaligned.h> +#include <asm/unaligned.h> #else #define get_unaligned_le16(_p) (*(u16 *)(_p)) #endif diff --git a/xen/common/unlzo.c b/xen/common/unlzo.c index bdcefa95b3..74056778eb 100644 --- a/xen/common/unlzo.c +++ b/xen/common/unlzo.c @@ -34,7 +34,7 @@ #ifdef __XEN__ #include <asm/byteorder.h> -#include <xen/unaligned.h> +#include <asm/unaligned.h> #else static inline u16 get_unaligned_be16(const void *p) diff --git a/xen/common/xz/private.h b/xen/common/xz/private.h index 2299705378..e6814250e8 100644 --- a/xen/common/xz/private.h +++ b/xen/common/xz/private.h @@ -13,7 +13,7 @@ #ifdef __XEN__ #include <xen/kernel.h> #include <asm/byteorder.h> -#include <xen/unaligned.h> +#include <asm/unaligned.h> #else static inline u32 get_unaligned_le32(const void *p) diff --git a/xen/common/zstd/mem.h b/xen/common/zstd/mem.h index ae1e305126..2acae6a8ed 100644 --- a/xen/common/zstd/mem.h +++ b/xen/common/zstd/mem.h @@ -23,7 +23,7 @@ #ifdef __XEN__ #include <xen/string.h> /* memcpy */ #include <xen/types.h> /* size_t, ptrdiff_t */ -#include <xen/unaligned.h> +#include <asm/unaligned.h> #endif /*-**************************************** diff --git a/xen/lib/xxhash32.c b/xen/lib/xxhash32.c index 32efa651c5..e8d403e5ce 100644 --- a/xen/lib/xxhash32.c +++ b/xen/lib/xxhash32.c @@ -42,7 +42,7 @@ #include <xen/errno.h> #include <xen/string.h> #include <xen/xxhash.h> -#include <xen/unaligned.h> +#include <asm/unaligned.h> /*-************************************* * Macros diff --git a/xen/lib/xxhash64.c b/xen/lib/xxhash64.c index 1858e236fe..481e76fbcf 100644 --- a/xen/lib/xxhash64.c +++ b/xen/lib/xxhash64.c @@ -43,7 +43,7 @@ #include <xen/errno.h> #include <xen/string.h> #include <xen/xxhash.h> -#include <xen/unaligned.h> +#include <asm/unaligned.h> #endif /*-************************************* -- generated by git-patchbot for /home/xen/git/xen.git#master
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |