Merge branch 'linux-2.6' into for-linus

1 files changed, 4 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index 703d40a65e7e..aef96259051f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 19
-EXTRAVERSION =-rc2
+EXTRAVERSION =
 NAME=Avast! A bilge rat!
 
 # *DOCUMENTATION*
@@ -499,6 +499,7 @@ endif
 
 ifdef CONFIG_UNWIND_INFO
 CFLAGS          += -fasynchronous-unwind-tables
+LDFLAGS_vmlinux += --eh-frame-hdr
 endif
 
 ifdef CONFIG_DEBUG_INFO
@@ -1319,7 +1320,8 @@ define xtags
             $(all-sources) | xargs $1 -a \
                 -I __initdata,__exitdata,__acquires,__releases \
                 -I EXPORT_SYMBOL,EXPORT_SYMBOL_GPL \
-                --extra=+f --c-kinds=+px; \
+                --extra=+f --c-kinds=+px \
+                --regex-asm='/ENTRY\(([^)]*)\).*/\1/'; \
             $(all-kconfigs) | xargs $1 -a \
                 --langdef=kconfig \
                 --language-force=kconfig \