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 <geert+renesas@glider.be>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

diff --git a/usr/include/Makefile b/usr/include/Makefile
index 771e32872b2ab12df289c8572e403c9d842c7237..6c6de1b1622b1a69255b4e9e926cb6efbf3d1d0b 100644 (file)
--- a/usr/include/Makefile
+++ b/usr/include/Makefile
@@ -78,7 +78,7 @@ quiet_cmd_hdrtest = HDRTEST $<
       cmd_hdrtest = \
                $(CC) $(c_flags) -fsyntax-only -x c /dev/null \
                        $(if $(filter-out $(no-header-test), $*.h), -include $< -include $<); \
-               $(PERL) $(src)/headers_check.pl $(obj) $(SRCARCH) $<; \
+               $(PERL) $(src)/headers_check.pl $(obj) $<; \
                touch $@
 
 $(obj)/%.hdrtest: $(obj)/%.h FORCE

diff --git a/usr/include/headers_check.pl b/usr/include/headers_check.pl
index b6aec5e4365f9bf2b58c615fd3c7e591da5c20b6..2b70bfa5558e64518808a22f2f926291da6e47a9 100755 (executable)
--- a/usr/include/headers_check.pl
+++ b/usr/include/headers_check.pl
@@ -3,9 +3,8 @@
 #
 # headers_check.pl execute a number of trivial consistency checks
 #
-# Usage: headers_check.pl dir arch [files...]
+# Usage: headers_check.pl dir [files...]
 # dir:   dir to look for included files
-# arch:  architecture
 # files: list of files to check
 #
 # The script reads the supplied files line by line and:
@@ -23,7 +22,7 @@ use warnings;
 use strict;
 use File::Basename;
 
-my ($dir, $arch, @files) = @ARGV;
+my ($dir, @files) = @ARGV;
 
 my $ret = 0;
 my $line;
@@ -54,10 +53,6 @@ sub check_include
                my $inc = $1;
                my $found;
                $found = stat($dir . "/" . $inc);
-               if (!$found) {
-                       $inc =~ s#asm/#asm-$arch/#;
-                       $found = stat($dir . "/" . $inc);
-               }
                if (!$found) {
                        printf STDERR "$filename:$lineno: included file '$inc' is not exported\n";
                        $ret = 1;