diff options
-rw-r--r-- | scripts/headers_check.pl | 10 | ||||
-rw-r--r-- | scripts/headers_install.pl | 17 |
2 files changed, 14 insertions, 13 deletions
diff --git a/scripts/headers_check.pl b/scripts/headers_check.pl index 15d53a6b1a1f..488a3b1f760f 100644 --- a/scripts/headers_check.pl +++ b/scripts/headers_check.pl | |||
@@ -1,4 +1,4 @@ | |||
1 | #!/usr/bin/perl | 1 | #!/usr/bin/perl -w |
2 | # | 2 | # |
3 | # headers_check.pl execute a number of trivial consistency checks | 3 | # headers_check.pl execute a number of trivial consistency checks |
4 | # | 4 | # |
@@ -17,7 +17,6 @@ | |||
17 | # 2) TODO: check for leaked CONFIG_ symbols | 17 | # 2) TODO: check for leaked CONFIG_ symbols |
18 | 18 | ||
19 | use strict; | 19 | use strict; |
20 | use warnings; | ||
21 | 20 | ||
22 | my ($dir, $arch, @files) = @ARGV; | 21 | my ($dir, $arch, @files) = @ARGV; |
23 | 22 | ||
@@ -27,14 +26,15 @@ my $lineno = 0; | |||
27 | my $filename; | 26 | my $filename; |
28 | 27 | ||
29 | foreach my $file (@files) { | 28 | foreach my $file (@files) { |
29 | local *FH; | ||
30 | $filename = $file; | 30 | $filename = $file; |
31 | open(my $fh, '<', "$filename") or die "$filename: $!\n"; | 31 | open(FH, "<$filename") or die "$filename: $!\n"; |
32 | $lineno = 0; | 32 | $lineno = 0; |
33 | while ($line = <$fh>) { | 33 | while ($line = <FH>) { |
34 | $lineno++; | 34 | $lineno++; |
35 | check_include(); | 35 | check_include(); |
36 | } | 36 | } |
37 | close $fh; | 37 | close FH; |
38 | } | 38 | } |
39 | exit $ret; | 39 | exit $ret; |
40 | 40 | ||
diff --git a/scripts/headers_install.pl b/scripts/headers_install.pl index 68591cd08731..7d2b4146e02f 100644 --- a/scripts/headers_install.pl +++ b/scripts/headers_install.pl | |||
@@ -1,4 +1,4 @@ | |||
1 | #!/usr/bin/perl | 1 | #!/usr/bin/perl -w |
2 | # | 2 | # |
3 | # headers_install prepare the listed header files for use in | 3 | # headers_install prepare the listed header files for use in |
4 | # user space and copy the files to their destination. | 4 | # user space and copy the files to their destination. |
@@ -17,28 +17,29 @@ | |||
17 | # 3) Drop all sections defined out by __KERNEL__ (using unifdef) | 17 | # 3) Drop all sections defined out by __KERNEL__ (using unifdef) |
18 | 18 | ||
19 | use strict; | 19 | use strict; |
20 | use warnings; | ||
21 | 20 | ||
22 | my ($readdir, $installdir, $arch, @files) = @ARGV; | 21 | my ($readdir, $installdir, $arch, @files) = @ARGV; |
23 | 22 | ||
24 | my $unifdef = "scripts/unifdef -U__KERNEL__"; | 23 | my $unifdef = "scripts/unifdef -U__KERNEL__"; |
25 | 24 | ||
26 | foreach my $file (@files) { | 25 | foreach my $file (@files) { |
26 | local *INFILE; | ||
27 | local *OUTFILE; | ||
27 | my $tmpfile = "$installdir/$file.tmp"; | 28 | my $tmpfile = "$installdir/$file.tmp"; |
28 | open(my $infile, '<', "$readdir/$file") | 29 | open(INFILE, "<$readdir/$file") |
29 | or die "$readdir/$file: $!\n"; | 30 | or die "$readdir/$file: $!\n"; |
30 | open(my $outfile, '>', "$tmpfile") or die "$tmpfile: $!\n"; | 31 | open(OUTFILE, ">$tmpfile") or die "$tmpfile: $!\n"; |
31 | while (my $line = <$infile>) { | 32 | while (my $line = <INFILE>) { |
32 | $line =~ s/([\s(])__user\s/$1/g; | 33 | $line =~ s/([\s(])__user\s/$1/g; |
33 | $line =~ s/([\s(])__force\s/$1/g; | 34 | $line =~ s/([\s(])__force\s/$1/g; |
34 | $line =~ s/([\s(])__iomem\s/$1/g; | 35 | $line =~ s/([\s(])__iomem\s/$1/g; |
35 | $line =~ s/\s__attribute_const__\s/ /g; | 36 | $line =~ s/\s__attribute_const__\s/ /g; |
36 | $line =~ s/\s__attribute_const__$//g; | 37 | $line =~ s/\s__attribute_const__$//g; |
37 | $line =~ s/^#include <linux\/compiler.h>//; | 38 | $line =~ s/^#include <linux\/compiler.h>//; |
38 | printf $outfile "%s", $line; | 39 | printf OUTFILE "%s", $line; |
39 | } | 40 | } |
40 | close $outfile; | 41 | close OUTFILE; |
41 | close $infile; | 42 | close INFILE; |
42 | system $unifdef . " $tmpfile > $installdir/$file"; | 43 | system $unifdef . " $tmpfile > $installdir/$file"; |
43 | unlink $tmpfile; | 44 | unlink $tmpfile; |
44 | } | 45 | } |