diff options
author | Rasmus Villemoes <linux@rasmusvillemoes.dk> | 2018-02-28 14:17:35 -0500 |
---|---|---|
committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2018-03-05 09:48:21 -0500 |
commit | 14a596a7e6fd9c5baa6b2cfc57962e2c3bda6c69 (patch) | |
tree | 1e7e92fc778b6e8290c1e04096efa2c94fcf2dfa /scripts/basic | |
parent | 661e50bc853209e41a5c14a290ca4decc43cbfd1 (diff) |
fixdep: remove stale references to uml-config.h
uml-config.h hasn't existed in this decade (87e299e5c750 - x86, um: get
rid of uml-config.h). The few remaining UML_CONFIG instances are defined
directly in terms of their real CONFIG symbol in common-offsets.h, so
unlike when the symbols got defined via a sed script, anything that uses
UML_CONFIG_FOO now should also automatically pick up a dependency on
CONFIG_FOO via the normal fixdep mechanism (since common-offsets.h
should at least recursively be a dependency). Hence I believe we should
actually be able to ignore the HELLO_CONFIG_BOOM cases.
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Richard Weinberger <richard@nod.at>
Cc: user-mode-linux-devel@lists.sourceforge.net
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'scripts/basic')
-rw-r--r-- | scripts/basic/fixdep.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c index fa3d39b6f23b..d7fbe545dd5d 100644 --- a/scripts/basic/fixdep.c +++ b/scripts/basic/fixdep.c | |||
@@ -93,14 +93,6 @@ | |||
93 | * (Note: it'd be easy to port over the complete mkdep state machine, | 93 | * (Note: it'd be easy to port over the complete mkdep state machine, |
94 | * but I don't think the added complexity is worth it) | 94 | * but I don't think the added complexity is worth it) |
95 | */ | 95 | */ |
96 | /* | ||
97 | * Note 2: if somebody writes HELLO_CONFIG_BOOM in a file, it will depend onto | ||
98 | * CONFIG_BOOM. This could seem a bug (not too hard to fix), but please do not | ||
99 | * fix it! Some UserModeLinux files (look at arch/um/) call CONFIG_BOOM as | ||
100 | * UML_CONFIG_BOOM, to avoid conflicts with /usr/include/linux/autoconf.h, | ||
101 | * through arch/um/include/uml-config.h; this fixdep "bug" makes sure that | ||
102 | * those files will have correct dependencies. | ||
103 | */ | ||
104 | 96 | ||
105 | #include <sys/types.h> | 97 | #include <sys/types.h> |
106 | #include <sys/stat.h> | 98 | #include <sys/stat.h> |
@@ -286,7 +278,6 @@ static int is_ignored_file(const char *s, int len) | |||
286 | { | 278 | { |
287 | return str_ends_with(s, len, "include/generated/autoconf.h") || | 279 | return str_ends_with(s, len, "include/generated/autoconf.h") || |
288 | str_ends_with(s, len, "include/generated/autoksyms.h") || | 280 | str_ends_with(s, len, "include/generated/autoksyms.h") || |
289 | str_ends_with(s, len, "arch/um/include/uml-config.h") || | ||
290 | str_ends_with(s, len, "include/linux/kconfig.h") || | 281 | str_ends_with(s, len, "include/linux/kconfig.h") || |
291 | str_ends_with(s, len, ".ver"); | 282 | str_ends_with(s, len, ".ver"); |
292 | } | 283 | } |