* [PATCH] backports: restore config_enabled() macro
@ 2017-02-07 11:15 Arend van Spriel
2017-02-07 12:29 ` Johannes Berg
0 siblings, 1 reply; 2+ messages in thread
From: Arend van Spriel @ 2017-02-07 11:15 UTC (permalink / raw)
To: Luis R. Rodriguez; +Cc: backports, Arend van Spriel
Attempted a backport to FC25 4.9.5 kernel and hit issue with IS_BUILTIN()
using config_enabled() macro in backport-include/linux/kconfig.h. Fix this
by using #ifndef.
Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
---
backport/backport-include/linux/kconfig.h | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/backport/backport-include/linux/kconfig.h b/backport/backport-include/linux/kconfig.h
index 4fe2a10..e284dca 100644
--- a/backport/backport-include/linux/kconfig.h
+++ b/backport/backport-include/linux/kconfig.h
@@ -21,6 +21,13 @@
(config_enabled(option) || config_enabled(option##_MODULE))
#endif
+/*
+ * Since 4.9 config_enabled has been removed in favor of __is_defined.
+ */
+#ifndef config_enabled
+#define config_enabled(cfg) __is_defined(cfg)
+#endif
+
#undef IS_BUILTIN
#define IS_BUILTIN(option) config_enabled(option)
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] backports: restore config_enabled() macro
2017-02-07 11:15 [PATCH] backports: restore config_enabled() macro Arend van Spriel
@ 2017-02-07 12:29 ` Johannes Berg
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Berg @ 2017-02-07 12:29 UTC (permalink / raw)
To: Arend van Spriel, Luis R. Rodriguez; +Cc: backports
On Tue, 2017-02-07 at 11:15 +0000, Arend van Spriel wrote:
> Attempted a backport to FC25 4.9.5 kernel and hit issue with
> IS_BUILTIN()
> using config_enabled() macro in backport-include/linux/kconfig.h. Fix
> this
> by using #ifndef.
Hah, very timely - I just had a problem with IS_REACHABLE that this
should solve nicely :)
johannes
--
To unsubscribe from this list: send the line "unsubscribe backports" in
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-02-07 12:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-07 11:15 [PATCH] backports: restore config_enabled() macro Arend van Spriel
2017-02-07 12:29 ` Johannes Berg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox