patch-2.4.4 linux/arch/cris/kernel/setup.c

• Lines: 87
• Date: Fri Apr 27 14:10:31 2001
• Orig file: v2.4.3/linux/arch/cris/kernel/setup.c
• Orig date: Thu Feb 8 16:32:44 2001

diff -u --recursive --new-file v2.4.3/linux/arch/cris/kernel/setup.c linux/arch/cris/kernel/setup.c
@@ -1,9 +1,9 @@
-/* $Id: setup.c,v 1.8 2001/01/16 16:31:38 bjornw Exp $
+/* $Id: setup.c,v 1.11 2001/03/02 15:52:03 bjornw Exp $
  *
  *  linux/arch/cris/kernel/setup.c
  *
  *  Copyright (C) 1995  Linus Torvalds
- *  Copyright (c) 2000  Axis Communications AB
+ *  Copyright (c) 2001  Axis Communications AB
  */
 
 /*
@@ -17,7 +17,7 @@
 #include <linux/stddef.h>
 #include <linux/unistd.h>
 #include <linux/ptrace.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/user.h>
 #include <linux/a.out.h>
 #include <linux/tty.h>
@@ -41,12 +41,6 @@
 
 unsigned char aux_device_present;
 
-#ifdef CONFIG_BLK_DEV_RAM
-extern int rd_doload;		/* 1 = load ramdisk, 0 = don't load */
-extern int rd_prompt;		/* 1 = prompt for ramdisk, 0 = don't prompt */
-extern int rd_image_start;	/* starting block # of image */
-#endif
-
 extern int root_mountflags;
 extern char _etext, _edata, _end;
 
@@ -75,7 +69,8 @@
  *
  */
 
-void __init setup_arch(char **cmdline_p)
+void __init 
+setup_arch(char **cmdline_p)
 {
         unsigned long bootmap_size;
 	unsigned long start_pfn, max_pfn;
@@ -179,7 +174,7 @@
 
 	/* give credit for the CRIS port */
 
-	printk("Linux/CRIS port on ETRAX 100LX (c) 2000 Axis Communications AB\n");
+	printk("Linux/CRIS port on ETRAX 100LX (c) 2001 Axis Communications AB\n");
 
 }
 
@@ -192,6 +187,7 @@
 #define HAS_ATA		0x0020
 #define HAS_USB		0x0040
 #define HAS_IRQ_BUG	0x0080
+#define HAS_MMU_BUG     0x0100
 
 static struct cpu_info {
 	char *model;
@@ -214,7 +210,8 @@
 	{ "Simulator",     8, HAS_ETHERNET100 | HAS_SCSI | HAS_ATA },
 	{ "ETRAX 100",     8, HAS_ETHERNET100 | HAS_SCSI | HAS_ATA | HAS_IRQ_BUG },
 	{ "ETRAX 100",     8, HAS_ETHERNET100 | HAS_SCSI | HAS_ATA },
-	{ "ETRAX 100LX",  8, HAS_ETHERNET100 | HAS_SCSI | HAS_ATA | HAS_USB | HAS_MMU },
+	{ "ETRAX 100LX",  8, HAS_ETHERNET100 | HAS_SCSI | HAS_ATA | HAS_USB | HAS_MMU | HAS_MMU_BUG },
+	{ "ETRAX 100LX v2",  8, HAS_ETHERNET100 | HAS_SCSI | HAS_ATA | HAS_USB | HAS_MMU },
 	{ "Unknown",   0, 0 },
 };
 
@@ -241,6 +238,7 @@
 		       "cache size\t: %d kB\n"
 		       "fpu\t\t: %s\n"
 		       "mmu\t\t: %s\n"
+		       "mmu DMA bug\t: %s\n"
 		       "ethernet\t: %s Mbps\n"
 		       "token ring\t: %s\n"
 		       "scsi\t\t: %s\n"
@@ -253,6 +251,7 @@
 		       cpu_info[revision].cache,
 		       cpu_info[revision].flags & HAS_FPU ? "yes" : "no",
 		       cpu_info[revision].flags & HAS_MMU ? "yes" : "no",
+		       cpu_info[revision].flags & HAS_MMU_BUG ? "yes" : "no",
 		       cpu_info[revision].flags & HAS_ETHERNET100 ? "10/100" : "10",
 		       cpu_info[revision].flags & HAS_TOKENRING ? "4/16 Mbps" : "no",
 		       cpu_info[revision].flags & HAS_SCSI ? "yes" : "no",