X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=Makefile;h=1ab3ebfc909198065a5d0b10a6e3ee0f1e768b3c;hb=9e41d9597e7825ec20d690013d32bcec5f3fe16a;hp=a2c2efe9e82edd7b9df112ce3aad7e76b8cb9501;hpb=59fcbddaff6f862cc1584b488866d9c4a5579085;p=deliverable%2Flinux.git

diff --git a/Makefile b/Makefile
index a2c2efe9e82e..1ab3ebfc9091 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 29
-EXTRAVERSION = -rc8
-NAME = Erotic Pickled Herring
+EXTRAVERSION =
+NAME = Temporary Tasmanian Devil
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"
@@ -569,6 +569,9 @@ KBUILD_CFLAGS += $(call cc-option,-Wno-pointer-sign,)
 # disable invalid "can't wrap" optimzations for signed / pointers
 KBUILD_CFLAGS	+= $(call cc-option,-fwrapv)
 
+# revert to pre-gcc-4.4 behaviour of .eh_frame
+KBUILD_CFLAGS	+= $(call cc-option,-fno-dwarf2-cfi-asm)
+
 # Add user supplied CPPFLAGS, AFLAGS and CFLAGS as the last assignments
 # But warn user when we do so
 warn-assign = \