--- linux-2.6.9-rc4-mm1/include/linux/profile.h 2004-10-11 19:52:04.000000000 +0200 +++ linux-2.6.9-rc4-mm1-mine/include/linux/profile.h 2004-10-11 23:17:01.000000000 +0200 @@ -8,6 +8,7 @@ #include #include #include +#include #define CPU_PROFILING 1 #define SCHED_PROFILING 2 @@ -17,8 +18,8 @@ /* init basic kernel profiler */ void __init profile_init(void); -void profile_tick(int, struct pt_regs *); -void profile_hit(int, void *); +void FASTCALL(__profile_hit(void *)); + #ifdef CONFIG_PROC_FS void create_prof_cpu_mask(struct proc_dir_entry *); #else @@ -101,6 +102,26 @@ #endif /* CONFIG_PROFILING */ +static inline void profile_hit(int type, void *pc) +{ + extern int prof_on; + extern atomic_t *prof_buffer; + + if (prof_on == type && prof_buffer) + __profile_hit(pc); +} + +static inline void profile_tick(int type, struct pt_regs *regs) +{ + extern cpumask_t prof_cpu_mask; + + if (type != CPU_PROFILING) + return; + profile_hook(regs); + if (!user_mode(regs) && cpu_isset(smp_processor_id(), prof_cpu_mask)) + profile_hit(type, (void *)profile_pc(regs)); +} + #endif /* __KERNEL__ */ #endif /* _LINUX_PROFILE_H */ --- linux-2.6.9-rc4-mm1/kernel/profile.c 2004-10-11 19:54:35.000000000 +0200 +++ linux-2.6.9-rc4-mm1-mine/kernel/profile.c 2004-10-11 23:34:19.000000000 +0200 @@ -34,10 +34,10 @@ #define NR_PROFILE_HIT (PAGE_SIZE/sizeof(struct profile_hit)) #define NR_PROFILE_GRP (NR_PROFILE_HIT/PROFILE_GRPSZ) -static atomic_t *prof_buffer; +atomic_t *prof_buffer; static unsigned long prof_len, prof_shift; -static int prof_on; -static cpumask_t prof_cpu_mask = CPU_MASK_ALL; +int prof_on; +cpumask_t prof_cpu_mask = CPU_MASK_ALL; #ifdef CONFIG_SMP static DEFINE_PER_CPU(struct profile_hit *[2], cpu_profile_hits); static DEFINE_PER_CPU(int, cpu_profile_flip); @@ -284,14 +284,12 @@ up(&profile_flip_mutex); } -void profile_hit(int type, void *__pc) +void fastcall __profile_hit(void *__pc) { unsigned long primary, secondary, flags, pc = (unsigned long)__pc; int i, j, cpu; struct profile_hit *hits; - if (prof_on != type || !prof_buffer) - return; pc = min((pc - (unsigned long)_stext) >> prof_shift, prof_len - 1); i = primary = (pc & (NR_PROFILE_GRP - 1)) << PROFILE_GRPSHIFT; secondary = (~(pc << 1) & (NR_PROFILE_GRP - 1)) << PROFILE_GRPSHIFT; @@ -380,26 +378,15 @@ #else /* !CONFIG_SMP */ #define profile_flip_buffers() do { } while (0) #define profile_discard_flip_buffers() do { } while (0) - -inline void profile_hit(int type, void *__pc) -{ - unsigned long pc; - +void __profile_hit(void *__pc) + { + unsigned long pc; + pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift; atomic_inc(&prof_buffer[min(pc, prof_len - 1)]); -} + } #endif /* !CONFIG_SMP */ -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)); -} - #ifdef CONFIG_PROC_FS #include #include