Skip to content

Commit d67393f

Browse files
geertumasahir0y
authored andcommitted
kbuild: Drop support for include/asm-<arch> in headers_check.pl
"include/asm-<arch>" was replaced by "arch/<arch>/include/asm" a long time ago. All assembler header files are now included using "#include <asm/*>", so there is no longer a need to rewrite paths. Signed-off-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Masahiro Yamada <[email protected]>
1 parent fac04ef commit d67393f

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

usr/include/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ quiet_cmd_hdrtest = HDRTEST $<
7878
cmd_hdrtest = \
7979
$(CC) $(c_flags) -fsyntax-only -x c /dev/null \
8080
$(if $(filter-out $(no-header-test), $*.h), -include $< -include $<); \
81-
$(PERL) $(src)/headers_check.pl $(obj) $(SRCARCH) $<; \
81+
$(PERL) $(src)/headers_check.pl $(obj) $<; \
8282
touch $@
8383

8484
$(obj)/%.hdrtest: $(obj)/%.h FORCE

usr/include/headers_check.pl

+2-7
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
#
44
# headers_check.pl execute a number of trivial consistency checks
55
#
6-
# Usage: headers_check.pl dir arch [files...]
6+
# Usage: headers_check.pl dir [files...]
77
# dir: dir to look for included files
8-
# arch: architecture
98
# files: list of files to check
109
#
1110
# The script reads the supplied files line by line and:
@@ -23,7 +22,7 @@
2322
use strict;
2423
use File::Basename;
2524

26-
my ($dir, $arch, @files) = @ARGV;
25+
my ($dir, @files) = @ARGV;
2726

2827
my $ret = 0;
2928
my $line;
@@ -54,10 +53,6 @@ sub check_include
5453
my $inc = $1;
5554
my $found;
5655
$found = stat($dir . "/" . $inc);
57-
if (!$found) {
58-
$inc =~ s#asm/#asm-$arch/#;
59-
$found = stat($dir . "/" . $inc);
60-
}
6156
if (!$found) {
6257
printf STDERR "$filename:$lineno: included file '$inc' is not exported\n";
6358
$ret = 1;

0 commit comments

Comments
 (0)