[Linuxconsole-commit]CVS: ruby/linux/arch/i386/kernel setup.c,1.34,1.35

[James S. <jsi...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/arch/i386/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv5099/linux/arch/i386/kernel

Modified Files:
	setup.c 
Log Message:
Synced to 2.5.4

Index: setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/i386/kernel/setup.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- setup.c	13 Mar 2002 23:48:36 -0000	1.34
+++ setup.c	14 Mar 2002 20:02:06 -0000	1.35
@@ -229,7 +229,7 @@
 
 	/* Video ROM is standard at C000:0000 - C7FF:0000, check signature */
 	for (base = 0xC0000; base < 0xE0000; base += 2048) {
-		romstart = bus_to_virt(base);
+		romstart = isa_bus_to_virt(base);
 		if (!romsignature(romstart))
 			continue;
 		request_resource(&iomem_resource, rom_resources + roms);
@@ -241,7 +241,7 @@
 	for (base = 0xC8000; base < 0xE0000; base += 2048) {
 		unsigned long length;
 
-		romstart = bus_to_virt(base);
+		romstart = isa_bus_to_virt(base);
 		if (!romsignature(romstart))
 			continue;
 		length = romstart[2] * 512;
@@ -270,7 +270,7 @@
 
 	/* Final check for motherboard extension rom at E000:0000 */
 	base = 0xE0000;
-	romstart = bus_to_virt(base);
+	romstart = isa_bus_to_virt(base);
 
 	if (romsignature(romstart)) {
 		rom_resources[roms].start = base;
@@ -688,10 +688,10 @@
 	init_mm.end_data = (unsigned long) &_edata;
 	init_mm.brk = (unsigned long) &_end;
 
-	code_resource.start = virt_to_bus(&_text);
-	code_resource.end = virt_to_bus(&_etext)-1;
-	data_resource.start = virt_to_bus(&_etext);
-	data_resource.end = virt_to_bus(&_edata)-1;
+	code_resource.start = virt_to_phys(&_text);
+	code_resource.end = virt_to_phys(&_etext)-1;
+	data_resource.start = virt_to_phys(&_etext);
+	data_resource.end = virt_to_phys(&_edata)-1;
 
 	parse_mem_cmdline(cmdline_p);
 
@@ -2640,7 +2640,7 @@
 		/* AMD-defined */
 		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
 		NULL, NULL, NULL, "syscall", NULL, NULL, NULL, NULL,
-		NULL, NULL, NULL, NULL, NULL, NULL, "mmxext", NULL,
+		NULL, NULL, NULL, "mp", NULL, NULL, "mmxext", NULL,
 		NULL, NULL, NULL, NULL, NULL, "lm", "3dnowext", "3dnow",
 
 		/* Transmeta-defined */
@@ -2805,7 +2805,7 @@
 	/*
 	 * Force FPU initialization:
 	 */
-	current->flags &= ~PF_USEDFPU;
+	clear_thread_flag(TIF_USEDFPU);
 	current->used_math = 0;
 	stts();
 }