Merge commit 'v2.6.35-rc3' into perf/core

Merge reason: Go from -rc1 base to -rc3 base, merge in fixes.

1 files changed, 6 insertions, 5 deletions

diff --git a/scripts/headers_check.pl b/scripts/headers_check.pl
index db1dd7a549f2..50d6cfd1fa77 100644
--- a/scripts/headers_check.pl
+++ b/scripts/headers_check.pl
@@ -28,11 +28,12 @@ my $lineno = 0;
 my $filename;
 
 foreach my $file (@files) {
-        local *FH;
         $filename = $file;
-        open(FH, "<$filename") or die "$filename: $!\n";
+
+        open(my $fh, '<', $filename)
+                or die "$filename: $!\n";
         $lineno = 0;
-        while ($line = <FH>) {
+        while ($line = <$fh>) {
                 $lineno++;
                 &check_include();
                 &check_asm_types();
@@ -40,7 +41,7 @@ foreach my $file (@files) {
                 &check_declarations();
                 # Dropped for now. Too much noise &check_config();
         }
-        close FH;
+        close $fh;
 }
 exit $ret;
 
@@ -78,7 +79,7 @@ sub check_config
 }
 
 my $linux_asm_types;
-sub check_asm_types()
+sub check_asm_types
 {
         if ($filename =~ /types.h|int-l64.h|int-ll64.h/o) {
                 return;