diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-12-03 10:51:50 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-12-03 10:51:50 +0100 |
| commit | ddd1bd5cfde57973ba816e118c9c452934bb09e7 (patch) | |
| tree | d90457baeb0bcc9d81cd1ea3a9d8c24cf9745d64 /include/linux/psi.h | |
| parent | e8e94fce14658defc659021a50d4253a681d02e7 (diff) | |
| parent | 2595646791c319cadfdbf271563aac97d0843dc7 (diff) | |
| download | lwn-ddd1bd5cfde57973ba816e118c9c452934bb09e7.tar.gz lwn-ddd1bd5cfde57973ba816e118c9c452934bb09e7.zip | |
Merge tag 'v4.20-rc5' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/psi.h')
| -rw-r--r-- | include/linux/psi.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/psi.h b/include/linux/psi.h index 8e0725aac0aa..7006008d5b72 100644 --- a/include/linux/psi.h +++ b/include/linux/psi.h @@ -1,6 +1,7 @@ #ifndef _LINUX_PSI_H #define _LINUX_PSI_H +#include <linux/jump_label.h> #include <linux/psi_types.h> #include <linux/sched.h> @@ -9,7 +10,7 @@ struct css_set; #ifdef CONFIG_PSI -extern bool psi_disabled; +extern struct static_key_false psi_disabled; void psi_init(void); |