]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
kconfig.h: use __is_defined() to check if MODULE is defined
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Tue, 14 Jun 2016 05:58:54 +0000 (14:58 +0900)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Mon, 5 Feb 2018 15:45:33 +0000 (16:45 +0100)
commitc5666e21e68e8f327f8af7f3d1d12fb503dc860c
treeb1b564aa50c93589325c823339e370146ebb78b1
parent363b9bee4ef73a1051361b864d8a73dda93621d7
kconfig.h: use __is_defined() to check if MODULE is defined

CVE-2017-5715 (Spectre v2 retpoline)

commit 4f920843d248946545415c1bf6120942048708ed upstream.

The macro MODULE is not a config option, it is a per-file build
option.  So, config_enabled(MODULE) is not sensible.  (There is
another case in include/linux/export.h, where config_enabled() is
used against a non-config option.)

This commit renames some macros in include/linux/kconfig.h for the
use for non-config macros and replaces config_enabled(MODULE) with
__is_defined(MODULE).

I am keeping config_enabled() because it is still referenced from
some places, but I expect it would be deprecated in the future.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Michal Marek <mmarek@suse.com>
Signed-off-by: Razvan Ghitulete <rga@amazon.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit b5d1dc3c5c7c320944b77d87d15ee9639e6542c8)
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
include/linux/kconfig.h