patch-2.4.0-test7 linux/arch/arm/kernel/setup.c

• Lines: 42
• Date: Sun Aug 13 09:54:15 2000
• Orig file: v2.4.0-test6/linux/arch/arm/kernel/setup.c
• Orig date: Mon Jul 10 16:47:19 2000

diff -u --recursive --new-file v2.4.0-test6/linux/arch/arm/kernel/setup.c linux/arch/arm/kernel/setup.c
@@ -19,7 +19,7 @@
 #include <asm/io.h>
 #include <asm/procinfo.h>
 #include <asm/setup.h>
-#include <asm/system.h>
+#include <asm/mach-types.h>
 
 #include "arch.h"
 
@@ -40,6 +40,7 @@
 extern int _stext, _text, _etext, _edata, _end;
 
 unsigned int processor_id;
+unsigned int compat;
 unsigned int __machine_arch_type;
 unsigned int system_rev;
 unsigned int system_serial_low;
@@ -161,6 +162,11 @@
 	}
 
 	printk("Architecture: %s\n", list->name);
+	if (compat)
+		printk(KERN_WARNING "Using compatability code "
+			"scheduled for removal in v%d.%d.%d\n",
+			compat >> 24, (compat >> 12) & 0x3ff,
+			compat & 0x3ff);
 
 	return list;
 }
@@ -304,12 +310,6 @@
 	char *from = default_command_line;
 
 	memset(&meminfo, 0, sizeof(meminfo));
-
-#if defined(CONFIG_ARCH_ARC)
-	__machine_arch_type = MACH_TYPE_ARCHIMEDES;
-#elif defined(CONFIG_ARCH_A5K)
-	__machine_arch_type = MACH_TYPE_A5K;
-#endif
 
 	setup_processor();