diff options
| author | Jiri Kosina <[email protected]> | 2020-04-01 12:26:12 +0200 | 
|---|---|---|
| committer | Jiri Kosina <[email protected]> | 2020-04-01 12:26:12 +0200 | 
| commit | c9f289701540baeef9ac7c9977d67a7259f404db (patch) | |
| tree | ac3c29d41da02ac735c9a12da78905842fbccd2f /include/linux/tick.h | |
| parent | 0aac6f9aaae5fba08963651d2ce49930145e118f (diff) | |
| parent | 910a7e89cec65efad254c947ce2bf8bf5b370962 (diff) | |
Merge branch 'for-5.7/appleir' into for-linus
- small code cleanups in hid-appleir from Lucas Tanure
Diffstat (limited to 'include/linux/tick.h')
| -rw-r--r-- | include/linux/tick.h | 5 | 
1 files changed, 4 insertions, 1 deletions
| diff --git a/include/linux/tick.h b/include/linux/tick.h index 7896f792d3b0..7340613c7eff 100644 --- a/include/linux/tick.h +++ b/include/linux/tick.h @@ -109,8 +109,10 @@ enum tick_dep_bits {  	TICK_DEP_BIT_PERF_EVENTS	= 1,  	TICK_DEP_BIT_SCHED		= 2,  	TICK_DEP_BIT_CLOCK_UNSTABLE	= 3, -	TICK_DEP_BIT_RCU		= 4 +	TICK_DEP_BIT_RCU		= 4, +	TICK_DEP_BIT_RCU_EXP		= 5  }; +#define TICK_DEP_BIT_MAX TICK_DEP_BIT_RCU_EXP  #define TICK_DEP_MASK_NONE		0  #define TICK_DEP_MASK_POSIX_TIMER	(1 << TICK_DEP_BIT_POSIX_TIMER) @@ -118,6 +120,7 @@ enum tick_dep_bits {  #define TICK_DEP_MASK_SCHED		(1 << TICK_DEP_BIT_SCHED)  #define TICK_DEP_MASK_CLOCK_UNSTABLE	(1 << TICK_DEP_BIT_CLOCK_UNSTABLE)  #define TICK_DEP_MASK_RCU		(1 << TICK_DEP_BIT_RCU) +#define TICK_DEP_MASK_RCU_EXP		(1 << TICK_DEP_BIT_RCU_EXP)  #ifdef CONFIG_NO_HZ_COMMON  extern bool tick_nohz_enabled; |