| Message ID | 20231205100756.18920-3-jgross@suse.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | xen: have a more generic unaligned.h header | expand |
On 05.12.2023 11:07, Juergen Gross wrote: > With include/xen/unaligned.h now dealing properly with unaligned > accesses for all architectures, asm/unaligned.h can be removed and > users can be switched to include xen/unaligned.h instead. > > Signed-off-by: Juergen Gross <jgross@suse.com> Reviewed-by: Jan Beulich <jbeulich@suse.com>
diff --git a/xen/arch/x86/include/asm/unaligned.h b/xen/arch/x86/include/asm/unaligned.h deleted file mode 100644 index 6070801d4a..0000000000 --- a/xen/arch/x86/include/asm/unaligned.h +++ /dev/null @@ -1,6 +0,0 @@ -#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 10609f5a53..6d81113266 100644 --- a/xen/common/lz4/defs.h +++ b/xen/common/lz4/defs.h @@ -10,7 +10,7 @@ #ifdef __XEN__ #include <asm/byteorder.h> -#include <asm/unaligned.h> +#include <xen/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 a87c76dded..cc03f0f554 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 <asm/unaligned.h> +#include <xen/unaligned.h> #else #define get_unaligned_le16(_p) (*(u16 *)(_p)) #endif diff --git a/xen/common/unlzo.c b/xen/common/unlzo.c index 74056778eb..bdcefa95b3 100644 --- a/xen/common/unlzo.c +++ b/xen/common/unlzo.c @@ -34,7 +34,7 @@ #ifdef __XEN__ #include <asm/byteorder.h> -#include <asm/unaligned.h> +#include <xen/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 e6814250e8..2299705378 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 <asm/unaligned.h> +#include <xen/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 2acae6a8ed..ae1e305126 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 <asm/unaligned.h> +#include <xen/unaligned.h> #endif /*-**************************************** diff --git a/xen/lib/xxhash32.c b/xen/lib/xxhash32.c index e8d403e5ce..32efa651c5 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 <asm/unaligned.h> +#include <xen/unaligned.h> /*-************************************* * Macros diff --git a/xen/lib/xxhash64.c b/xen/lib/xxhash64.c index 481e76fbcf..1858e236fe 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 <asm/unaligned.h> +#include <xen/unaligned.h> #endif /*-*************************************
With include/xen/unaligned.h now dealing properly with unaligned accesses for all architectures, asm/unaligned.h can be removed and users can be switched to include xen/unaligned.h instead. Signed-off-by: Juergen Gross <jgross@suse.com> --- 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, 7 insertions(+), 13 deletions(-) delete mode 100644 xen/arch/x86/include/asm/unaligned.h