diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-12-12 20:44:25 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-12-12 20:44:25 +0100 |
commit | 2bf3b685a35c80fe368dad9da0e77ba48b460939 (patch) | |
tree | 3516a82ec33f96d5e9d3f36abef751aa0b788748 /include/linux/kconfig.h | |
parent | bf006e149a5717a4614d44a62090ae98775af7a0 (diff) | |
parent | d06e622d3d9206e6a2cc45a0f9a3256da8773ff4 (diff) | |
download | op-kernel-dev-2bf3b685a35c80fe368dad9da0e77ba48b460939.zip op-kernel-dev-2bf3b685a35c80fe368dad9da0e77ba48b460939.tar.gz |
Merge schedutil governor updates for v4.10.
Diffstat (limited to 'include/linux/kconfig.h')
-rw-r--r-- | include/linux/kconfig.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/kconfig.h b/include/linux/kconfig.h index 15ec117..8f2e059 100644 --- a/include/linux/kconfig.h +++ b/include/linux/kconfig.h @@ -31,7 +31,6 @@ * When CONFIG_BOOGER is not defined, we generate a (... 1, 0) pair, and when * the last step cherry picks the 2nd arg, we get a zero. */ -#define config_enabled(cfg) ___is_defined(cfg) #define __is_defined(x) ___is_defined(x) #define ___is_defined(val) ____is_defined(__ARG_PLACEHOLDER_##val) #define ____is_defined(arg1_or_junk) __take_second_arg(arg1_or_junk 1, 0) @@ -41,13 +40,13 @@ * otherwise. For boolean options, this is equivalent to * IS_ENABLED(CONFIG_FOO). */ -#define IS_BUILTIN(option) config_enabled(option) +#define IS_BUILTIN(option) __is_defined(option) /* * IS_MODULE(CONFIG_FOO) evaluates to 1 if CONFIG_FOO is set to 'm', 0 * otherwise. */ -#define IS_MODULE(option) config_enabled(option##_MODULE) +#define IS_MODULE(option) __is_defined(option##_MODULE) /* * IS_REACHABLE(CONFIG_FOO) evaluates to 1 if the currently compiled |