Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6

[sfrench/cifs-2.6.git] / scripts / headers_install.pl

diff --git a/scripts/headers_install.pl b/scripts/headers_install.pl
index b89ca2c58fdbbe3592f97a27592675417713653c..4ca3be3b2e50ef90c0a0e5e5e054aec081405b1b 100644 (file)
--- a/scripts/headers_install.pl
+++ b/scripts/headers_install.pl
@@ -23,13 +23,13 @@ my ($readdir, $installdir, $arch, @files) = @ARGV;
 my $unifdef = "scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__";
 
 foreach my $file (@files) {
-       local *INFILE;
-       local *OUTFILE;
        my $tmpfile = "$installdir/$file.tmp";
-       open(INFILE, "<$readdir/$file")
-               or die "$readdir/$file: $!\n";
-       open(OUTFILE, ">$tmpfile") or die "$tmpfile: $!\n";
-       while (my $line = <INFILE>) {
+
+       open(my $in, '<', "$readdir/$file")
+           or die "$readdir/$file: $!\n";
+       open(my $out, '>', $tmpfile)
+           or die "$tmpfile: $!\n";
+       while (my $line = <$in>) {
                $line =~ s/([\s(])__user\s/$1/g;
                $line =~ s/([\s(])__force\s/$1/g;
                $line =~ s/([\s(])__iomem\s/$1/g;
@@ -39,10 +39,11 @@ foreach my $file (@files) {
                $line =~ s/(^|\s)(inline)\b/$1__$2__/g;
                $line =~ s/(^|\s)(asm)\b(\s|[(]|$)/$1__$2__$3/g;
                $line =~ s/(^|\s|[(])(volatile)\b(\s|[(]|$)/$1__$2__$3/g;
-               printf OUTFILE "%s", $line;
+               printf {$out} "%s", $line;
        }
-       close OUTFILE;
-       close INFILE;
+       close $out;
+       close $in;
+
        system $unifdef . " $tmpfile > $installdir/$file";
        unlink $tmpfile;
 }