Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next: (30 commits)
  Use macros for .data.page_aligned section.
  Use macros for .bss.page_aligned section.
  Use new __init_task_data macro in arch init_task.c files.
  kbuild: Don't define ALIGN and ENTRY when preprocessing linker scripts.
  arm, cris, mips, sparc, powerpc, um, xtensa: fix build with bash 4.0
  kbuild: add static to prototypes
  kbuild: fail build if recordmcount.pl fails
  kbuild: set -fconserve-stack option for gcc 4.5
  kbuild: echo the record_mcount command
  gconfig: disable "typeahead find" search in treeviews
  kbuild: fix cc1 options check to ensure we do not use -fPIC when compiling
  checkincludes.pl: add option to remove duplicates in place
  markup_oops: use modinfo to avoid confusion with underscored module names
  checkincludes.pl: provide usage helper
  checkincludes.pl: close file as soon as we're done with it
  ctags: usability fix
  kernel hacking: move STRIP_ASM_SYMS from General
  gitignore usr/initramfs_data.cpio.bz2 and usr/initramfs_data.cpio.lzma
  kbuild: Check if linker supports the -X option
  kbuild: introduce ld-option
  ...

Fix trivial conflict in scripts/basic/fixdep.c

1 files changed, 66 insertions, 5 deletions

diff --git a/scripts/checkincludes.pl b/scripts/checkincludes.pl
index 8e6b716c191c..676ddc07d6fa 100755
--- a/scripts/checkincludes.pl
+++ b/scripts/checkincludes.pl
@@ -1,24 +1,85 @@
 #!/usr/bin/perl
 #
-# checkincludes: Find files included more than once in (other) files.
+# checkincludes: find/remove files included more than once
+#
 # Copyright abandoned, 2000, Niels Kristian Bech Jensen <nkbj@image.dk>.
+# Copyright 2009 Luis R. Rodriguez <mcgrof@gmail.com>
+#
+# This script checks for duplicate includes. It also has support
+# to remove them in place. Note that this will not take into
+# consideration macros so you should run this only if you know
+# you do have real dups and do not have them under #ifdef's. You
+# could also just review the results.
+
+sub usage {
+        print "Usage: checkincludes.pl [-r]\n";
+        print "By default we just warn of duplicates\n";
+        print "To remove duplicated includes in place use -r\n";
+        exit 1;
+}
+
+my $remove = 0;
+
+if ($#ARGV < 0) {
+        usage();
+}
+
+if ($#ARGV >= 1) {
+        if ($ARGV[0] =~ /^-/) {
+                if ($ARGV[0] eq "-r") {
+                        $remove = 1;
+                        shift;
+                } else {
+                        usage();
+                }
+        }
+}
 
 foreach $file (@ARGV) {
         open(FILE, $file) or die "Cannot open $file: $!.\n";
 
         my %includedfiles = ();
+        my @file_lines = ();
 
         while (<FILE>) {
                 if (m/^\s*#\s*include\s*[<"](\S*)[>"]/o) {
                         ++$includedfiles{$1};
                 }
+                push(@file_lines, $_);
         }
-        
-        foreach $filename (keys %includedfiles) {
-                if ($includedfiles{$filename} > 1) {
-                        print "$file: $filename is included more than once.\n";
+
+        close(FILE);
+
+        if (!$remove) {
+                foreach $filename (keys %includedfiles) {
+                        if ($includedfiles{$filename} > 1) {
+                                print "$file: $filename is included more than once.\n";
+                        }
                 }
+                next;
         }
 
+        open(FILE,">$file") || die("Cannot write to $file: $!");
+
+        my $dups = 0;
+        foreach (@file_lines) {
+                if (m/^\s*#\s*include\s*[<"](\S*)[>"]/o) {
+                        foreach $filename (keys %includedfiles) {
+                                if ($1 eq $filename) {
+                                        if ($includedfiles{$filename} > 1) {
+                                                $includedfiles{$filename}--;
+                                                $dups++;
+                                        } else {
+                                                print FILE $_;
+                                        }
+                                }
+                        }
+                } else {
+                        print FILE $_;
+                }
+        }
+        if ($dups > 0) {
+                print "$file: removed $dups duplicate includes\n";
+        }
         close(FILE);
 }