fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / arch / arm26 / kernel / setup.c

diff --git a/arch/arm26/kernel/setup.c b/arch/arm26/kernel/setup.c
index afb7db5..466ddb5 100644 (file)
--- a/arch/arm26/kernel/setup.c
+++ b/arch/arm26/kernel/setup.c
@@ -1,5 +1,5 @@
 /*
- *  linux/arch/arm/kernel/setup.c
+ *  linux/arch/arm26/kernel/setup.c
  *
  *  Copyright (C) 1995-2001 Russell King
  *  Copyright (C) 2003 Ian Molton
@@ -8,7 +8,6 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/stddef.h>
 #include <linux/ioport.h>
@@ -18,7 +17,7 @@
 #include <linux/console.h>
 #include <linux/bootmem.h>
 #include <linux/seq_file.h>
-#include <linux/tty.h>
+#include <linux/screen_info.h>
 #include <linux/init.h>
 #include <linux/root_dev.h>
 
@@ -37,7 +36,7 @@
 #endif
 
 #ifdef CONFIG_PREEMPT
-spinlock_t kernel_flag = SPIN_LOCK_UNLOCKED;
+DEFINE_SPINLOCK(kernel_flag);
 #endif
 
 #if defined(CONFIG_FPE_NWFPE)
@@ -74,9 +73,7 @@ unsigned int number_mfm_drives;
 
 struct processor processor;
 
-unsigned char aux_device_present;
 char elf_platform[ELF_PLATFORM_SIZE];
-char saved_command_line[COMMAND_LINE_SIZE];
 
 unsigned long phys_initrd_start __initdata = 0;
 unsigned long phys_initrd_size __initdata = 0;
@@ -120,7 +117,7 @@ static void __init setup_processor(void)
        /*
         * locate processor in the list of supported processor
         * types.  The linker builds this table for us from the
-        * entries in arch/arm/mm/proc-*.S
+        * entries in arch/arm26/mm/proc-*.S
         */
        for (list = &__proc_info_begin; list < &__proc_info_end ; list++)
                if ((processor_id & list->cpu_mask) == list->cpu_val)
@@ -146,7 +143,7 @@ static void __init setup_processor(void)
 
        dump_cpu_info();
 
-       sprintf(system_utsname.machine, "%s", list->arch_name);
+       sprintf(init_utsname()->machine, "%s", list->arch_name);
        sprintf(elf_platform, "%s", list->elf_name);
        elf_hwcap = list->elf_hwcap;