Merge ../torvalds-2.6/

2 files changed, 4 insertions, 6 deletions

diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index 9087273abf91..db3c708e546b 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -49,6 +49,9 @@ build := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build obj
 cmd = @$(if $($(quiet)cmd_$(1)),\
       echo '  $(subst ','\'',$($(quiet)cmd_$(1)))' &&) $(cmd_$(1))
 
+# Add $(obj)/ for paths that is not absolute
+objectify = $(foreach o,$(1),$(if $(filter /%,$(o)),$(o),$(obj)/$(o)))
+
 ###
 # if_changed      - execute command if any prerequisite is newer than 
 #                   target, or command line has changed
diff --git a/scripts/reference_discarded.pl b/scripts/reference_discarded.pl
index f04f62736851..c2d54148a91f 100644
--- a/scripts/reference_discarded.pl
+++ b/scripts/reference_discarded.pl
@@ -91,12 +91,7 @@ foreach $object (keys(%object)) {
                      $from !~ /\.exit\.data$/ &&
                      $from !~ /\.altinstructions$/ &&
                      $from !~ /\.pdr$/ &&
-                     $from !~ /\.debug_info$/ &&
-                     $from !~ /\.debug_aranges$/ &&
-                     $from !~ /\.debug_ranges$/ &&
-                     $from !~ /\.debug_line$/ &&
-                     $from !~ /\.debug_frame$/ &&
-                     $from !~ /\.debug_loc$/ &&
+                     $from !~ /\.debug_.*$/ &&
                      $from !~ /\.exitcall\.exit$/ &&
                      $from !~ /\.eh_frame$/ &&
                      $from !~ /\.stab$/)) {