From: Andrew Morton This just makes it compile. Methinks theres quite a bit of breakage here. Cc: "H. Peter Anvin" Signed-off-by: Andrew Morton --- arch/sparc64/kernel/setup.c | 24 ------------------------ 1 files changed, 24 deletions(-) diff -puN arch/sparc64/kernel/setup.c~git-klibc-build-hacks arch/sparc64/kernel/setup.c --- 25-sparc64/arch/sparc64/kernel/setup.c~git-klibc-build-hacks 2006-05-14 23:25:02.000000000 -0700 +++ 25-sparc64-akpm/arch/sparc64/kernel/setup.c 2006-05-14 23:25:56.000000000 -0700 @@ -214,8 +214,6 @@ extern unsigned short ram_flags; #define RAMDISK_PROMPT_FLAG 0x8000 #define RAMDISK_LOAD_FLAG 0x4000 -extern int root_mountflags; - char reboot_command[COMMAND_LINE_SIZE]; static struct pt_regs fake_swapper_regs = { { 0, }, 0, 0, 0, 0 }; @@ -346,8 +344,6 @@ void __init setup_arch(char **cmdline_p) idprom_init(); - if (!root_flags) - root_mountflags &= ~MS_RDONLY; ROOT_DEV = old_decode_dev(root_dev); #ifdef CONFIG_BLK_DEV_RAM rd_image_start = ram_flags & RAMDISK_IMAGE_START_MASK; @@ -357,26 +353,6 @@ void __init setup_arch(char **cmdline_p) task_thread_info(&init_task)->kregs = &fake_swapper_regs; -#ifdef CONFIG_IP_PNP - if (!ic_set_manually) { - int chosen = prom_finddevice ("/chosen"); - u32 cl, sv, gw; - - cl = prom_getintdefault (chosen, "client-ip", 0); - sv = prom_getintdefault (chosen, "server-ip", 0); - gw = prom_getintdefault (chosen, "gateway-ip", 0); - if (cl && sv) { - ic_myaddr = cl; - ic_servaddr = sv; - if (gw) - ic_gateway = gw; -#if defined(CONFIG_IP_PNP_BOOTP) || defined(CONFIG_IP_PNP_RARP) - ic_proto_enabled = 0; -#endif - } - } -#endif - smp_setup_cpu_possible_map(); /* Get boot processor trap_block[] setup. */ _