[kernel] r14006 - in dists/lenny/linux-2.6/debian: . patches/bugfix/all patches/series

[Moritz Muehlenhoff]

Author: jmm
Date: Sat Jul 25 08:57:29 2009
New Revision: 14006

Log:
fix TSC merge regression

Added:
   dists/lenny/linux-2.6/debian/patches/bugfix/all/x86-fix-tsc-unification-leftover.patch
Modified:
   dists/lenny/linux-2.6/debian/changelog
   dists/lenny/linux-2.6/debian/patches/series/18

Modified: dists/lenny/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny/linux-2.6/debian/changelog	Sat Jul 25 00:07:13 2009	(r14005)
+++ dists/lenny/linux-2.6/debian/changelog	Sat Jul 25 08:57:29 2009	(r14006)
@@ -27,6 +27,7 @@
   * Emit HPET warning only once to avoid syslog floods, which occur on
     some systems like HP DC7900 (Closes: #512617)
   * Fix support for AverMedia AverTV Cardbus Hybrid E506R (Closes: #511385)
+  * Fix null pointer dereferences in hrtick_start_fair() (Closes: #538332)
 
   [ dann frazier ]
   * sata_nv: avoid link reset on controllers where it's broken

Added: dists/lenny/linux-2.6/debian/patches/bugfix/all/x86-fix-tsc-unification-leftover.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/bugfix/all/x86-fix-tsc-unification-leftover.patch	Sat Jul 25 08:57:29 2009	(r14006)
@@ -0,0 +1,61 @@
+From: Ingo Molnar <mingo at elte.hu>
+Date: Fri, 11 Jul 2008 13:09:15 +0000 (+0200)
+Subject: x86: fix tsc unification buglet with ftrace and stackprotector
+X-Git-Tag: v2.6.27-rc1~1102^2~28
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=3d0decc4f49e8645cd6369b02ed076bebd3d61ad
+
+x86: fix tsc unification buglet with ftrace and stackprotector
+
+Yinghai Lu reported crashes on 64-bit x86:
+
+ BUG: unable to handle kernel NULL pointer dereference at 0000000000000000
+ IP: [<ffffffff80253b17>] hrtick_start_fair+0x89/0x173
+ [...]
+
+And with a long session of debugging and a lot of difficulty, tracked it down
+to this commit:
+
+ --------------->
+ 8fbbc4b45ce3e4c0eeb15004c79c72b6896a79c2 is first bad commit
+ commit 8fbbc4b45ce3e4c0eeb15004c79c72b6896a79c2
+ Author: Alok Kataria <akataria at vmware.com>
+ Date:   Tue Jul 1 11:43:34 2008 -0700
+
+     x86: merge tsc_init and clocksource code
+ <--------------
+
+The problem is that the TSC unification missed these Makefile rules
+in arch/x86/kernel/Makefile:
+
+  # Do not profile debug and lowlevel utilities
+  CFLAGS_REMOVE_tsc_64.o = -pg
+  CFLAGS_REMOVE_tsc_32.o = -pg
+  ...
+  CFLAGS_tsc_64.o         := $(nostackp)
+  ...
+
+which rules make sure that various instrumentation and debugging
+facilities are disabled for code that might end up in a VDSO - such as
+the TSC code.
+
+Reported-and-bisected-by: Yinghai Lu <yhlu.kernel at gmail.com>
+Signed-off-by: Ingo Molnar <mingo at elte.hu>
+
+Conflicts:
+
+Signed-off-by: Ingo Molnar <mingo at elte.hu>
+---
+
+diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
+index 59b14c9..4033d8d 100644
+--- a/arch/x86/kernel/Makefile
++++ b/arch/x86/kernel/Makefile
+@@ -13,7 +13,7 @@ CPPFLAGS_vmlinux.lds += -U$(UTS_MACHINE)
+ nostackp := $(call cc-option, -fno-stack-protector)
+ CFLAGS_vsyscall_64.o	:= $(PROFILING) -g0 $(nostackp)
+ CFLAGS_hpet.o		:= $(nostackp)
+-CFLAGS_tsc_64.o		:= $(nostackp)
++CFLAGS_tsc.o		:= $(nostackp)
+ 
+ obj-y			:= process_$(BITS).o signal_$(BITS).o entry_$(BITS).o
+ obj-y			+= traps_$(BITS).o irq_$(BITS).o

Modified: dists/lenny/linux-2.6/debian/patches/series/18
==============================================================================
--- dists/lenny/linux-2.6/debian/patches/series/18	Sat Jul 25 00:07:13 2009	(r14005)
+++ dists/lenny/linux-2.6/debian/patches/series/18	Sat Jul 25 08:57:29 2009	(r14006)
@@ -13,3 +13,4 @@
 + bugfix/all/hpet-avoid-log-flooding.patch
 + bugfix/all/video-support-avertv-cardbus-hybrid-e506r.patch
 + bugfix/all/fbmon-work-around-compiler-bug.patch
++ bugfix/all/x86-fix-tsc-unification-leftover.patch