From: William Lee Irwin III <wli@holomorphy.com>

sparc64 needs profile.h and to terminate comments describing %o7.

Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 25-akpm/arch/sparc64/kernel/smp.c  |    1 +
 25-akpm/arch/sparc64/kernel/time.c |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff -puN arch/sparc64/kernel/smp.c~profile_pc-fix-3 arch/sparc64/kernel/smp.c
--- 25/arch/sparc64/kernel/smp.c~profile_pc-fix-3	Thu Aug  5 14:45:49 2004
+++ 25-akpm/arch/sparc64/kernel/smp.c	Thu Aug  5 14:45:49 2004
@@ -19,6 +19,7 @@
 #include <linux/seq_file.h>
 #include <linux/cache.h>
 #include <linux/jiffies.h>
+#include <linux/profile.h>
 
 #include <asm/head.h>
 #include <asm/ptrace.h>
diff -puN arch/sparc64/kernel/time.c~profile_pc-fix-3 arch/sparc64/kernel/time.c
--- 25/arch/sparc64/kernel/time.c~profile_pc-fix-3	Thu Aug  5 14:45:49 2004
+++ 25-akpm/arch/sparc64/kernel/time.c	Thu Aug  5 14:45:49 2004
@@ -29,6 +29,7 @@
 #include <linux/jiffies.h>
 #include <linux/cpufreq.h>
 #include <linux/percpu.h>
+#include <linux/profile.h>
 
 #include <asm/oplib.h>
 #include <asm/mostek.h>
@@ -460,7 +461,7 @@ unsigned long profile_pc(struct pt_regs 
 	     pc < (unsigned long) &__bzero_end) ||
 	    (pc >= (unsigned long) &__bitops_begin &&
 	     pc < (unsigned long) &__bitops_end))
-		pc = regs->u_regs[UREG_RETPC]; /* o7/
+		pc = regs->u_regs[UREG_RETPC]; /* o7 */
 	return pc;
 }
 
_