Re: 2.6.8-rc3-mm1

[William Lee Irwin III <wli@holomorphy.com>]

On Thu, Aug 05, 2004 at 03:19:18AM -0700, Andrew Morton wrote:
> +consolidate-prof_cpu_mask.patch
> +profile_pc.patch
> +profile_tick.patch
> +profile-tick-fix.patch
> +move-profile-operations.patch
> +make-private-profile-state-static.patch
> +make-prof_buffer-atomic_t.patch
>  Consolidate a lot of the kernel profiling code.

Minor gaffe on my part:

--- mm1-2.6.8-rc3/include/asm-ia64/ptrace.h.orig	2004-08-05 22:42:16.312957563 -0700
+++ mm1-2.6.8-rc3/include/asm-ia64/ptrace.h	2004-08-05 22:46:36.284634066 -0700
@@ -232,11 +232,11 @@
 /* Conserve space in histogram by encoding slot bits in address
  * bits 2 and 3 rather than bits 0 and 1.
  */
-static inline unsigned long profile_pc(struct pt_regs *regs)
-{
-	unsigned long ip = instruction_pointer(regs);
-	return (ip & ~3UL) + ((ip & 3UL) << 2);
-}
+#define profile_pc(regs)						\
+({									\
+	unsigned long __ip = instruction_pointer(regs);			\
+	(__ip & ~3UL) + ((__ip & 3UL) << 2);				\
+})
 
   /* given a pointer to a task_struct, return the user's pt_regs */
 # define ia64_task_regs(t)		(((struct pt_regs *) ((char *) (t) + IA64_STK_OFFSET)) - 1)