[SPARC]: Fix length parameter verification in sys_getdomainname().

[linux-2.6-omap-h63xx.git] / arch / sparc / kernel / setup.c

diff --git a/arch/sparc/kernel/setup.c b/arch/sparc/kernel/setup.c
index 2cbf282f0d004d9bdf2813b043fffa0f0e1f096d..35488d6c74574ff4e8a38d63480010780a9e49c7 100644 (file)
--- a/arch/sparc/kernel/setup.c
+++ b/arch/sparc/kernel/setup.c
@@ -17,9 +17,8 @@
 #include <asm/smp.h>
 #include <linux/user.h>
 #include <linux/a.out.h>
-#include <linux/tty.h>
+#include <linux/screen_info.h>
 #include <linux/delay.h>
-#include <linux/config.h>
 #include <linux/fs.h>
 #include <linux/seq_file.h>
 #include <linux/syscalls.h>
@@ -332,7 +331,7 @@ void __init setup_arch(char **cmdline_p)
        if (!root_flags)
                root_mountflags &= ~MS_RDONLY;
        ROOT_DEV = old_decode_dev(root_dev);
-#ifdef CONFIG_BLK_DEV_INITRD
+#ifdef CONFIG_BLK_DEV_RAM
        rd_image_start = ram_flags & RAMDISK_IMAGE_START_MASK;
        rd_prompt = ((ram_flags & RAMDISK_PROMPT_FLAG) != 0);
        rd_doload = ((ram_flags & RAMDISK_LOAD_FLAG) != 0);     
@@ -496,7 +495,7 @@ static int __init topology_init(void)
                if (!p)
                        err = -ENOMEM;
                else
-                       register_cpu(p, i, NULL);
+                       register_cpu(p, i);
        }
 
        return err;