On Sat, May 24, 2008 at 12:53:16PM -0700, Andrew Morton wrote:
> On Sat, 24 May 2008 21:25:40 +0200 Sam Ravnborg <sam@xxxxxxxxxxxx> wrote:
>
> > 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.
>
> It could help to get us out of the occasional sticky situation, but it
> does seem a bit risky. What happens with Kconfig variables which are
> just not known about at all with some .configs?
>
> Silly example, one could add
>
> if (KCONFIG_DVB_VES1820)
>
> to kernel/sched.c and that would work happily until someone sets DVB=n,
> in which case I assume KCONFIG_DVB_VES1820 doesn't get defined
> anywhere?
It would have helped if I had applied the correct patch...
All boolean and tristate symbols in the konfiguration have
their symbols defined as KCONFIG_* no matter their values.
So KCONFIG_DVB_VES1820 would get defined.
Correct patch below.
Sam
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index ee5fe94..247ea30 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -666,6 +666,43 @@ out:
return res;
}
+static void write_tristate_config(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);
+ break;
+ case yes:
+ fprintf(m, "CONFIG_%s=y\n", sym->name);
+ fprintf(h, "#define CONFIG_%s 1\n", sym->name);
+ break;
+ case no:
+ break;
+ }
+}
+
+static void write_tristate_kconfig(FILE *f, struct symbol *sym)
+{
+ switch (sym_get_tristate_value(sym)) {
+ case mod:
+ fprintf(f, "#define KCONFIG_%s 1\n", sym->name);
+ if (sym->type == S_TRISTATE)
+ fprintf(f, "#define KCONFIG_%s_MODULE 1\n", sym->name);
+ break;
+ case yes:
+ fprintf(f, "#define KCONFIG_%s 1\n", sym->name);
+ if (sym->type == S_TRISTATE)
+ fprintf(f, "#define KCONFIG_%s_MODULE 0\n", sym->name);
+ break;
+ case no:
+ fprintf(f, "#define KCONFIG_%s 0\n", sym->name);
+ if (sym->type == S_TRISTATE)
+ fprintf(f, "#define KCONFIG_%s_MODULE 0\n", sym->name);
+ break;
+ }
+}
+
int conf_write_autoconf(void)
{
struct symbol *sym;
@@ -716,18 +753,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_config(out, out_h, sym);
break;
case S_STRING:
str = sym_get_string_value(sym);
@@ -765,6 +791,19 @@ int conf_write_autoconf(void)
break;
}
}
+ for_all_symbols(i, sym) {
+ sym_calc_value(sym);
+ if (!sym->name)
+ continue;
+ switch (sym->type) {
+ case S_BOOLEAN:
+ case S_TRISTATE:
+ write_tristate_kconfig(out_h, sym);
+ break;
+ default:
+ break;
+ }
+ }
fclose(out);
fclose(out_h);
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
