Commit 2e3646e51b2d6415549b310655df63e7e0d7a080 changed the way
the split config tree is built, but failed to also adjust fixdep
accordingly - if changing a config option from or to m, files
referencing the respective CONFIG_..._MODULE (but not the
corresponding CONFIG_...) didn't get rebuilt.
Once at it, also eliminate false dependencies due to use of
...CONFIG_... identifiers.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
--- linux-2.6.21-rc5/scripts/basic/fixdep.c 2007-02-04 19:44:54.000000000 +0100
+++ 2.6.21-rc5-fixdep-mod/scripts/basic/fixdep.c 2007-03-29 11:11:10.000000000 +0200
@@ -29,8 +29,7 @@
* option which is mentioned in any of the listed prequisites.
*
* To be exact, split-include populates a tree in include/config/,
- * e.g. include/config/his/driver.h, which contains the #define/#undef
- * for the CONFIG_HIS_DRIVER option.
+ * e.g. include/config/his/driver.h, consiting of empty files.
*
* So if the user changes his CONFIG_HIS_DRIVER option, only the objects
* which depend on "include/linux/config/his/driver.h" will be rebuilt,
@@ -223,7 +222,7 @@ void use_config(char *m, int slen)
void parse_config_file(char *map, size_t len)
{
int *end = (int *) (map + len);
- /* start at +1, so that p can never be < map */
+ /* start at +1, so that p can never be <= map */
int *m = (int *) map + 1;
char *p, *q;
@@ -235,6 +234,8 @@ void parse_config_file(char *map, size_t
continue;
conf:
if (p > map + len - 7)
+ break;
+ if (isalnum(p[-1]) || p[-1] == '_')
continue;
if (memcmp(p, "CONFIG_", 7))
continue;
@@ -245,6 +246,8 @@ void parse_config_file(char *map, size_t
continue;
found:
+ if (!memcmp(q - 7, "_MODULE", 7))
+ q -= 7;
use_config(p+7, q-p-7);
}
}
-
