patch-2.3.29 linux/arch/i386/kernel/setup.c

Next file: linux/arch/i386/kernel/signal.c
Previous file: linux/arch/i386/kernel/pci-i386.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.28/linux/arch/i386/kernel/setup.c linux/arch/i386/kernel/setup.c
@@ -449,6 +449,9 @@
 			case E820_ACPI:
 					printk("(ACPI data)\n");
 					break;
+			case E820_NVS:
+					printk("(ACPI NVS)\n");
+					break;
 			default:	printk("type %lu\n", e820.map[i].type);
 					break;
 			}
@@ -634,7 +637,6 @@
 	highstart_pfn = highend_pfn = max_pfn;
 	if (max_pfn > MAXMEM_PFN) {
 		highstart_pfn = MAXMEM_PFN;
-		highend_pfn = max_pfn;
 		printk(KERN_NOTICE "%ldMB HIGHMEM available.\n",
 			pages_to_mb(highend_pfn - highstart_pfn));
 	}

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)