Merge samba.org:/scratch/anton/linux-2.5

into samba.org:/scratch/anton/sfr

arch/sparc64/kernel/setup.c

@@ -688,6 +688,7 @@ static int __init topology_init(void)
 	sparc64_cpus = kmalloc(NR_CPUS * sizeof(struct cpu), GFP_KERNEL);
 	if (!sparc64_cpus)
 		return -ENOMEM;
+	memset(sparc64_cpus, 0, NR_CPUS * sizeof(struct cpu));
 	for (i = 0; i < NR_CPUS; i++) {
 		if (cpu_possible(i))
 			register_cpu(&sparc64_cpus[i], i, NULL);

drivers/base/hotplug.c

@@ -17,6 +17,8 @@
 #include <linux/err.h>
 #include <linux/kmod.h>
 #include <linux/interrupt.h>
+#include <linux/sched.h>
+#include <linux/string.h>
 #include "base.h"
 #include "fs/fs.h"
 

drivers/pnp/interface.c

@@ -13,6 +13,7 @@
 #include <linux/types.h>
 #include <linux/stat.h>
 #include <linux/ctype.h>
+#include <linux/slab.h>
 #include <asm/uaccess.h>
 
 #include "base.h"

fs/sysfs/mount.c

@@ -7,6 +7,7 @@
 #include <linux/fs.h>
 #include <linux/mount.h>
 #include <linux/pagemap.h>
+#include <linux/init.h>
 
 #include "sysfs.h"