diff options
| author | Tony Lindgren <tony@atomide.com> | 2021-10-06 07:55:44 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2021-10-06 07:55:44 +0300 |
| commit | e700ac213a0f793fb4f83098413303e3dd080892 (patch) | |
| tree | 52130e5a24ec9ea55b2f81899b8a45bed0f17f7c /tools/include/linux | |
| parent | e879f855e590b40fe3c79f2fbd8f65ca3c724120 (diff) | |
| parent | b232537074fcaf0c2837abbb217429c097bb7598 (diff) | |
| download | cachepc-linux-e700ac213a0f793fb4f83098413303e3dd080892.tar.gz cachepc-linux-e700ac213a0f793fb4f83098413303e3dd080892.zip | |
Merge branch 'pruss-fix' into fixes
Merge in a fix for pruss reset issue caused by enabling pruss for am335x.
Diffstat (limited to 'tools/include/linux')
| -rw-r--r-- | tools/include/linux/bitmap.h | 4 | ||||
| -rw-r--r-- | tools/include/linux/compiler_types.h | 18 | ||||
| -rw-r--r-- | tools/include/linux/kconfig.h | 6 |
3 files changed, 20 insertions, 8 deletions
diff --git a/tools/include/linux/bitmap.h b/tools/include/linux/bitmap.h index 9d959bc24859..95611df1d26e 100644 --- a/tools/include/linux/bitmap.h +++ b/tools/include/linux/bitmap.h @@ -111,10 +111,10 @@ static inline int test_and_clear_bit(int nr, unsigned long *addr) } /** - * bitmap_alloc - Allocate bitmap + * bitmap_zalloc - Allocate bitmap * @nbits: Number of bits */ -static inline unsigned long *bitmap_alloc(int nbits) +static inline unsigned long *bitmap_zalloc(int nbits) { return calloc(1, BITS_TO_LONGS(nbits) * sizeof(unsigned long)); } diff --git a/tools/include/linux/compiler_types.h b/tools/include/linux/compiler_types.h index feea09029f61..24ae3054f304 100644 --- a/tools/include/linux/compiler_types.h +++ b/tools/include/linux/compiler_types.h @@ -13,6 +13,24 @@ #define __has_builtin(x) (0) #endif +#ifdef __CHECKER__ +/* context/locking */ +# define __must_hold(x) __attribute__((context(x,1,1))) +# define __acquires(x) __attribute__((context(x,0,1))) +# define __releases(x) __attribute__((context(x,1,0))) +# define __acquire(x) __context__(x,1) +# define __release(x) __context__(x,-1) +# define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0) +#else /* __CHECKER__ */ +/* context/locking */ +# define __must_hold(x) +# define __acquires(x) +# define __releases(x) +# define __acquire(x) (void)0 +# define __release(x) (void)0 +# define __cond_lock(x,c) (c) +#endif /* __CHECKER__ */ + /* Compiler specific macros. */ #ifdef __GNUC__ #include <linux/compiler-gcc.h> diff --git a/tools/include/linux/kconfig.h b/tools/include/linux/kconfig.h index 1555a0c4f345..13b86bd3b746 100644 --- a/tools/include/linux/kconfig.h +++ b/tools/include/linux/kconfig.h @@ -4,12 +4,6 @@ /* CONFIG_CC_VERSION_TEXT (Do not delete this comment. See help in Kconfig) */ -#ifdef CONFIG_CPU_BIG_ENDIAN -#define __BIG_ENDIAN 4321 -#else -#define __LITTLE_ENDIAN 1234 -#endif - #define __ARG_PLACEHOLDER_1 0, #define __take_second_arg(__ignored, val, ...) val |