Skip to contentSkip to conversation

2.6.9-rc3-mm3

DISCUSSION Andi Kleen 1 participant 1 message Oct 7, 2004 3 messages not in the archive

lore
Share & tools
lore

Andi Kleen

author
#3 lore raw
In reply to a message not in the archive
Quoted 10 lines · Andrew Morton
Quoted 8 lines · Nick Sanders
Quoted 3 lines · Andrew Morton

ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.9-rc3/2.6 .9-rc3-mm3/

I get the following oops when booting and it also stops kde (artswrapper) from starting with the same call trace. USB seems to be working which is good.

Quoted 8 lines

Could you please do

cd /usr/src/linux
wget ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.9-rc3/2.6.9-rc3-mm3/broken-out/optimize-profile-path-slightly.patch patch -R -p1 < optimize-profile-path-slightly.patch

and retest?

Oops. I forgot the scheduling path indeed. Here's a new patch, replacing the old. Sorry for the trouble.

-Andi

-------------------------------------------------------------

Fixed version of slight profile path optimization.

kernel/profile.c +10 -3
Index: linux/kernel/profile.c
===================================================================
@@ -181,20 +181,27 @@
 EXPORT_SYMBOL_GPL(profile_event_register);
 EXPORT_SYMBOL_GPL(profile_event_unregister);
 
-void profile_hit(int type, void *__pc)
+static inline void __profile_hit(int type, void *__pc)
 {
 	unsigned long pc;
 
-	if (prof_on != type || !prof_buffer)
-		return;
 	pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
 	atomic_inc(&prof_buffer[min(pc, prof_len - 1)]);
 }
 
+void profile_hit(int type, void *pc)
+{
+	if (prof_on != type || !prof_buffer)
+		return;
+	__profile_hit(type, pc);
+}
+
 void profile_tick(int type, struct pt_regs *regs)
 {
 	if (type == CPU_PROFILING)
 		profile_hook(regs);
+	if (prof_on != type || !prof_buffer)
+		return;
 	if (!user_mode(regs) && cpu_isset(smp_processor_id(), prof_cpu_mask))
 		profile_hit(type, (void *)profile_pc(regs));
 }