patch-2.1.101 linux/arch/arm/kernel/setup-ebsa110.c

Next file: linux/arch/arm/kernel/setup.c
Previous file: linux/arch/arm/kernel/process.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.100/linux/arch/arm/kernel/setup-ebsa110.c linux/arch/arm/kernel/setup-ebsa110.c
@@ -18,7 +18,6 @@
 #include <linux/unistd.h>
 #include <linux/ptrace.h>
 #include <linux/malloc.h>
-#include <linux/ldt.h>
 #include <linux/user.h>
 #include <linux/a.out.h>
 #include <linux/tty.h>
@@ -30,6 +29,7 @@
 
 #include <asm/hardware.h>
 #include <asm/pgtable.h>
+#include <asm/procinfo.h>
 #include <asm/segment.h>
 #include <asm/setup.h>
 #include <asm/system.h>
@@ -41,17 +41,25 @@
 
 #define MEM_SIZE	(16*1024*1024)
 
-static char command_line[COMMAND_LINE_SIZE] = { 0, };
-       char saved_command_line[COMMAND_LINE_SIZE];
-
-struct processor processor;
 struct screen_info screen_info;
+struct processor processor;
 unsigned char aux_device_present;
+
+extern const struct processor sa110_processor_functions;
+
+struct armversions armidlist[] = {
+	{ 0x4401a100, 0xfffffff0, F_MMU|F_32BIT	, "DEC",	"sa110"		, &sa110_processor_functions  , "sa1x"},
+	{ 0x00000000, 0x00000000, 0		, "***",	"*unknown*"	, NULL			      , NULL  }
+};
+
 unsigned long arm_id;
+int armidindex;
 
 extern int root_mountflags;
 extern int _etext, _edata, _end;
-extern const struct processor sa110_processor_functions;
+
+static char command_line[COMMAND_LINE_SIZE] = { 0, };
+       char saved_command_line[COMMAND_LINE_SIZE];
 
 #ifdef CONFIG_BLK_DEV_RAM
 extern int rd_doload;		/* 1 = load ramdisk, 0 = don't load */
@@ -110,6 +118,8 @@
 	int len = 0;
 
 	memory_start = (unsigned long)&_end;
+
+	armidindex = 0;
 
 	processor = sa110_processor_functions;
 	processor._proc_init();

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov