Re: 2.6.8-rc3-mm1

[William Lee Irwin III]

On Thu, Aug 05, 2004 at 03:19:18AM -0700, Andrew Morton wrote:
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.8-rc3/2.6.8-rc3-mm1/
> - Added David Woodhouse's MTD tree to the "external trees" list
> - Dropped the staircase scheduler, mainly because the schedstats patch broke
>   it.
>   We learned quite a lot from having staircase in there.  Now it's time for
>   a new scheduler anyway.

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

Index: mm1-2.6.8-rc3/arch/sparc64/kernel/time.c
===================================================================
--- mm1-2.6.8-rc3.orig/arch/sparc64/kernel/time.c
+++ mm1-2.6.8-rc3/arch/sparc64/kernel/time.c
@@ -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 @@
 	     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;
 }
 
Index: mm1-2.6.8-rc3/arch/sparc64/kernel/smp.c
===================================================================
--- mm1-2.6.8-rc3.orig/arch/sparc64/kernel/smp.c
+++ mm1-2.6.8-rc3/arch/sparc64/kernel/smp.c
@@ -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>
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/