[PATCH] backports: restore config_enabled() macro

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxxxxx>
---
 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



[Index of Archives]     [Linux ARM Kernel]     [Linux ARM]     [Linux Omap]     [Fedora ARM]     [IETF Annouce]     [Security]     [Bugtraq]     [Linux]     [Linux OMAP]     [Linux MIPS]     [ECOS]     [Asterisk Internet PBX]     [Linux API]

  Powered by Linux