diff options
| author | Tom Rini <trini@konsulko.com> | 2020-05-19 10:51:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-19 10:51:43 -0400 |
| commit | c2279d784e35fa25ee3a9fa28a74a1ba545f8c1e (patch) | |
| tree | 158fd30f3d06142f6a99cbae6ed8ccb0f3be567b /include/linux | |
| parent | ed9a3aa6452f57af65eb74f73bd2a54c3a2f4b03 (diff) | |
| parent | cd93d625fd751d55c729c78b10f82109d56a5f1d (diff) | |
Merge branch '2020-05-18-reduce-size-of-common.h'
Bring in the latest round of Simon's changes to reduce what's in
<common.h> overall.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/bitops.h | 4 | ||||
| -rw-r--r-- | include/linux/compat.h | 1 | ||||
| -rw-r--r-- | include/linux/mtd/rawnand.h | 1 | ||||
| -rw-r--r-- | include/linux/soc/ti/cppi5.h | 1 | ||||
| -rw-r--r-- | include/linux/soc/ti/k3-navss-ringacc.h | 1 | ||||
| -rw-r--r-- | include/linux/soc/ti/ti_sci_protocol.h | 1 |
6 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/bitops.h b/include/linux/bitops.h index a07c70fd48..6b509dce58 100644 --- a/include/linux/bitops.h +++ b/include/linux/bitops.h @@ -1,6 +1,8 @@ #ifndef _LINUX_BITOPS_H #define _LINUX_BITOPS_H +#ifndef USE_HOSTCC + #include <asm/types.h> #include <asm-generic/bitsperlong.h> #include <linux/compiler.h> @@ -216,4 +218,6 @@ static inline void generic_clear_bit(int nr, volatile unsigned long *addr) *p &= ~mask; } +#endif /* !USE_HOSTCC */ + #endif diff --git a/include/linux/compat.h b/include/linux/compat.h index 171188a76f..712eeaef4e 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -1,6 +1,7 @@ #ifndef _LINUX_COMPAT_H_ #define _LINUX_COMPAT_H_ +#include <log.h> #include <malloc.h> #include <linux/types.h> #include <linux/err.h> diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h index bd373b9617..66febc6b72 100644 --- a/include/linux/mtd/rawnand.h +++ b/include/linux/mtd/rawnand.h @@ -16,6 +16,7 @@ #include <config.h> #include <dm/device.h> +#include <linux/bitops.h> #include <linux/compat.h> #include <linux/mtd/mtd.h> #include <linux/mtd/flashchip.h> diff --git a/include/linux/soc/ti/cppi5.h b/include/linux/soc/ti/cppi5.h index 34038b31f7..cfdf7ea29f 100644 --- a/include/linux/soc/ti/cppi5.h +++ b/include/linux/soc/ti/cppi5.h @@ -10,6 +10,7 @@ #include <hexdump.h> #include <linux/bitops.h> +#include <linux/bug.h> /** * Descriptor header, present in all types of descriptors diff --git a/include/linux/soc/ti/k3-navss-ringacc.h b/include/linux/soc/ti/k3-navss-ringacc.h index 487dfe9859..7b027f8bd4 100644 --- a/include/linux/soc/ti/k3-navss-ringacc.h +++ b/include/linux/soc/ti/k3-navss-ringacc.h @@ -9,6 +9,7 @@ #define __SOC_TI_K3_NAVSS_RINGACC_API_H_ #include <dm/ofnode.h> +#include <linux/bitops.h> /** * enum k3_nav_ring_mode - &struct k3_nav_ring_cfg mode diff --git a/include/linux/soc/ti/ti_sci_protocol.h b/include/linux/soc/ti/ti_sci_protocol.h index 8c4863efe1..eb916ba101 100644 --- a/include/linux/soc/ti/ti_sci_protocol.h +++ b/include/linux/soc/ti/ti_sci_protocol.h @@ -20,6 +20,7 @@ * @firmware_revision: Firmware revision (not usually used). * @firmware_description: Firmware description (not usually used). */ +#include <linux/bitops.h> struct ti_sci_version_info { u8 abi_major; u8 abi_minor; |