Pull asm-generic updates from Arnd Bergmann: "There are only three fairly simple patches. The #include change to linux/swab.h addresses a userspace build issue, and the change to the mmio tracing logic helps provide more useful traces" * tag 'asm-generic-6.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic: uapi: Add missing _UAPI prefix to <asm-generic/types.h> include guard asm-generic/io: Add _RET_IP_ to MMIO trace for more accurate debug info include/uapi/linux/swab: Fix potentially missing __always_inline
Showing the changes to include/uapi (2 of 5 files). Show all
Unified · Split
| @@ -1,9 +1,9 @@ | ||
| 1 | 1 | /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ |
| 2 | −#ifndef _ASM_GENERIC_TYPES_H | |
| 3 | −#define _ASM_GENERIC_TYPES_H | |
| 2 | +#ifndef _UAPI_ASM_GENERIC_TYPES_H | |
| 3 | +#define _UAPI_ASM_GENERIC_TYPES_H | |
| 4 | 4 | /* |
| 5 | 5 | * int-ll64 is used everywhere now. |
| 6 | 6 | */ |
| 7 | 7 | #include <asm-generic/int-ll64.h> |
| 8 | 8 | |
| 9 | −#endif /* _ASM_GENERIC_TYPES_H */ | |
| 9 | +#endif /* _UAPI_ASM_GENERIC_TYPES_H */ | |
| @@ -3,7 +3,7 @@ · 2 unmodified lines | ||
| 3 | 3 | #define _UAPI_LINUX_SWAB_H |
| 4 | 4 | |
| 5 | 5 | #include <linux/types.h> |
| 6 | −#include <linux/compiler.h> | |
| 6 | +#include <linux/stddef.h> | |
| 7 | 7 | #include <asm/bitsperlong.h> |
| 8 | 8 | #include <asm/swab.h> |
| 9 | 9 | |