From: Sam Ravnborg <sam@ravnborg.org>
To: linux-kbuild <linux-kbuild@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Andrew Morton <akpm@linux-foundation.org>,
Roman Zippel <zippel@linux-m68k.org>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Subject: [RFC PATCH] kconfig: introduce KCONFIG_* symbols for .c files
Date: Sat, 24 May 2008 21:25:40 +0200 [thread overview]
Message-ID: <20080524192540.GA28067@uranus.ravnborg.org> (raw)
We have many places in the kernel that looks like
the following:
#ifdef CONFIG_FOO
...
#endif
Which has the disadvantage that the code denoted '...'
are not even built if CONFIG_FOO is not selected in
the current configuration.
We know that gcc do simple code-elimination for
conditionals which is always true/false and
thus the above code could be turned into:
if (CONFIG_FOO)
...
One line smaller and we follow the normal flow in the program.
The code is always build but we do not waste space as gcc will
do proper code-elimination for us.
Today this is not possible because kconfig will only
define CONFIG_FOO if selected and FOO is not a module.
The following patch implement a new set of defines in
the KCONFIG_* namespace.
For a tristate symbol the following are defined:
FOO not selected:
#define KCONFIG_FOO 0
#define KCONFIG_FOO_MODULE 0
FOO is built-in ('y')
#define KCONFIG_FOO 1
#define KCONFIG_FOO_MODULE 0
FOO is a module ('m'):
#define KCONFIG_FOO 1
#define KCONFIG_FOO_MODULE 1
In other words KCONFIG_FOO will say if the
symbol is selected and KCONFIG_FOO_MODULE
will say if it is a module.
With the above included we can now do:
if (KCONFIG_FOO)
...
This is not a replacement for the CONFIG_*
defines but a pleasant supplement.
Using KCONFIG_FOO will also give us a nice
error message the day that FOO is no longer part
of the configuration.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index ee5fe94..011a5ec 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -666,6 +666,31 @@ out:
return res;
}
+static void write_tristate(FILE *m, FILE *h, struct symbol *sym)
+{
+ switch (sym_get_tristate_value(sym)) {
+ case mod:
+ fprintf(m, "CONFIG_%s=m\n", sym->name);
+ fprintf(h, "#define CONFIG_%s_MODULE 1\n", sym->name);
+ fprintf(h, "#define KCONFIG_%s 1\n", sym->name);
+ if (sym->type == S_TRISTATE)
+ fprintf(h, "#define KCONFIG_%s_MODULE 1\n", sym->name);
+ break;
+ case yes:
+ fprintf(m, "CONFIG_%s=y\n", sym->name);
+ fprintf(h, "#define CONFIG_%s 1\n", sym->name);
+ fprintf(h, "#define KCONFIG_%s 1\n", sym->name);
+ if (sym->type == S_TRISTATE)
+ fprintf(h, "#define KCONFIG_%s_MODULE 0\n", sym->name);
+ break;
+ case no:
+ fprintf(h, "#define KCONFIG_%s 0\n", sym->name);
+ if (sym->type == S_TRISTATE)
+ fprintf(h, "#define KCONFIG_%s_MODULE 0\n", sym->name);
+ break;
+ }
+}
+
int conf_write_autoconf(void)
{
struct symbol *sym;
@@ -716,18 +741,7 @@ int conf_write_autoconf(void)
switch (sym->type) {
case S_BOOLEAN:
case S_TRISTATE:
- switch (sym_get_tristate_value(sym)) {
- case no:
- break;
- case mod:
- fprintf(out, "CONFIG_%s=m\n", sym->name);
- fprintf(out_h, "#define CONFIG_%s_MODULE 1\n", sym->name);
- break;
- case yes:
- fprintf(out, "CONFIG_%s=y\n", sym->name);
- fprintf(out_h, "#define CONFIG_%s 1\n", sym->name);
- break;
- }
+ write_tristate(out, out_h, sym);
break;
case S_STRING:
str = sym_get_string_value(sym);
next reply other threads:[~2008-05-24 19:25 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-24 19:25 Sam Ravnborg [this message]
2008-05-24 19:53 ` [RFC PATCH] kconfig: introduce KCONFIG_* symbols for .c files Andrew Morton
2008-05-24 20:14 ` Jeremy Fitzhardinge
2008-05-24 20:46 ` Sam Ravnborg
2008-05-24 20:56 ` Jeremy Fitzhardinge
2008-05-24 21:03 ` Sam Ravnborg
2008-05-24 20:24 ` Sam Ravnborg
2008-05-24 20:48 ` Andrew Morton
2008-05-24 21:00 ` Sam Ravnborg
2008-05-24 20:05 ` Adrian Bunk
2008-05-24 20:44 ` Sam Ravnborg
2008-05-24 20:57 ` Adrian Bunk
2008-05-24 20:20 ` Linus Torvalds
2008-05-24 20:37 ` [PATCH] x86: use defconfig as last resort Sam Ravnborg
2008-05-25 1:30 ` Linus Torvalds
2008-05-25 6:15 ` Sam Ravnborg
2008-05-25 6:22 ` Sam Ravnborg
2008-05-24 20:48 ` [RFC PATCH] kconfig: introduce KCONFIG_* symbols for .c files Jeremy Fitzhardinge
2008-05-24 20:58 ` Jeremy Fitzhardinge
2008-05-24 21:03 ` Adrian Bunk
2008-05-24 21:13 ` Jeremy Fitzhardinge
2008-05-24 21:26 ` Pavel Machek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080524192540.GA28067@uranus.ravnborg.org \
--to=sam@ravnborg.org \
--cc=akpm@linux-foundation.org \
--cc=jeremy@goop.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=zippel@linux-m68k.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox