diff options
| author | Tom Rini <trini@konsulko.com> | 2020-02-11 10:58:41 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-02-11 10:58:41 -0500 |
| commit | 9a8942b53d57149754e0dfc975e0d92d1afd4087 (patch) | |
| tree | de55e5352f3a8a79c413c0b8cb533428e5476841 /include/linux | |
| parent | ae347120eed8204b1fdf018ddf79131964e57016 (diff) | |
| parent | 21d651fb29cf268b1a5f64d080e3d352ee32c87f (diff) | |
| download | u-boot-9a8942b53d57149754e0dfc975e0d92d1afd4087.tar.gz u-boot-9a8942b53d57149754e0dfc975e0d92d1afd4087.tar.xz u-boot-9a8942b53d57149754e0dfc975e0d92d1afd4087.zip | |
Merge tag 'dm-pull-6feb20' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm
sandbox conversion to SDL2
TPM TEE driver
Various minor sandbox video enhancements
New driver model core utility functions
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/clk-provider.h | 1 | ||||
| -rw-r--r-- | include/linux/compat.h | 3 | ||||
| -rw-r--r-- | include/linux/mtd/mtd.h | 4 | ||||
| -rw-r--r-- | include/linux/string.h | 7 |
4 files changed, 12 insertions, 3 deletions
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h index 0ef6e685ad..8a20743ad8 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -13,6 +13,7 @@ #include <linux/bitops.h> #include <linux/err.h> #include <clk-uclass.h> +#include <linux/err.h> static inline void clk_dm(ulong id, struct clk *clk) { diff --git a/include/linux/compat.h b/include/linux/compat.h index d0f51baab4..171188a76f 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -123,7 +123,10 @@ static inline void kmem_cache_destroy(struct kmem_cache *cachep) #define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) +/* This is also defined in ARMv8's mmu.h */ +#ifndef PAGE_SIZE #define PAGE_SIZE 4096 +#endif /* drivers/char/random.c */ #define get_random_bytes(...) diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index ceffd994de..1b9151714c 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -129,8 +129,8 @@ struct mtd_oob_region { struct mtd_ooblayout_ops { int (*ecc)(struct mtd_info *mtd, int section, struct mtd_oob_region *oobecc); - int (*free)(struct mtd_info *mtd, int section, - struct mtd_oob_region *oobfree); + int (*rfree)(struct mtd_info *mtd, int section, + struct mtd_oob_region *oobfree); }; /* diff --git a/include/linux/string.h b/include/linux/string.h index 5d63be4ce5..d67998e5c4 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -91,10 +91,15 @@ extern __kernel_size_t strnlen(const char *,__kernel_size_t); size_t strcspn(const char *s, const char *reject); #endif +#ifdef CONFIG_SANDBOX +# define strdup sandbox_strdup +# define strndup sandbox_strndup +#endif + #ifndef __HAVE_ARCH_STRDUP extern char * strdup(const char *); -#endif extern char * strndup(const char *, size_t); +#endif #ifndef __HAVE_ARCH_STRSWAB extern char * strswab(const char *); #endif |