| From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> |
| Subject: include/linux/unaligned: replace kernel.h with the necessary inclusions |
| |
| When kernel.h is used in the headers it adds a lot into dependency hell, |
| especially when there are circular dependencies are involved. |
| |
| Replace kernel.h inclusion with the list of what is really being used. |
| |
| The rest of the changes are induced by the above and may not be split. |
| |
| Link: https://lkml.kernel.org/r/20211209123823.20425-1-andriy.shevchenko@linux.intel.com |
| Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> |
| Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com> [brcmfmac] |
| Acked-by: Kalle Valo <kvalo@kernel.org> |
| Cc: Arend van Spriel <aspriel@gmail.com> |
| Cc: Franky Lin <franky.lin@broadcom.com> |
| Cc: Hante Meuleman <hante.meuleman@broadcom.com> |
| Cc: Chi-hsien Lin <chi-hsien.lin@infineon.com> |
| Cc: Wright Feng <wright.feng@infineon.com> |
| Cc: Chung-hsien Hsu <chung-hsien.hsu@infineon.com> |
| Cc: Kalle Valo <kvalo@codeaurora.org> |
| Cc: David S. Miller <davem@davemloft.net> |
| Cc: Jakub Kicinski <kuba@kernel.org> |
| Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| --- |
| |
| drivers/net/wireless/broadcom/brcm80211/brcmfmac/xtlv.c | 2 ++ |
| include/linux/unaligned/packed_struct.h | 2 +- |
| lib/lz4/lz4defs.h | 2 ++ |
| 3 files changed, 5 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/xtlv.c~include-linux-unaligned-replace-kernelh-with-the-necessary-inclusions |
| +++ a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/xtlv.c |
| @@ -4,6 +4,8 @@ |
| */ |
| |
| #include <asm/unaligned.h> |
| + |
| +#include <linux/math.h> |
| #include <linux/string.h> |
| #include <linux/bug.h> |
| |
| --- a/include/linux/unaligned/packed_struct.h~include-linux-unaligned-replace-kernelh-with-the-necessary-inclusions |
| +++ a/include/linux/unaligned/packed_struct.h |
| @@ -1,7 +1,7 @@ |
| #ifndef _LINUX_UNALIGNED_PACKED_STRUCT_H |
| #define _LINUX_UNALIGNED_PACKED_STRUCT_H |
| |
| -#include <linux/kernel.h> |
| +#include <linux/types.h> |
| |
| struct __una_u16 { u16 x; } __packed; |
| struct __una_u32 { u32 x; } __packed; |
| --- a/lib/lz4/lz4defs.h~include-linux-unaligned-replace-kernelh-with-the-necessary-inclusions |
| +++ a/lib/lz4/lz4defs.h |
| @@ -36,6 +36,8 @@ |
| */ |
| |
| #include <asm/unaligned.h> |
| + |
| +#include <linux/bitops.h> |
| #include <linux/string.h> /* memset, memcpy */ |
| |
| #define FORCE_INLINE __always_inline |
| _ |