patch-2.3.15 linux/arch/i386/mm/init.c

Next file: linux/arch/m68k/amiga/chipram.c
Previous file: linux/arch/i386/lib/semaphore.S
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.14/linux/arch/i386/mm/init.c linux/arch/i386/mm/init.c
@@ -389,9 +389,10 @@
 	 * IBM messed up *AGAIN* in their thinkpad: 0xA0000 -> 0x9F000.
 	 * They seem to have done something stupid with the floppy
 	 * controller as well..
-	 * The amount of available base memory is in WORD 40:13.
+	 * The amount of available base memory is in WORD 40:13. Except
+	 * when it isn't.
 	 */
-	endbase = PAGE_OFFSET + ((*(unsigned short *)__va(0x413) * 1024) & PAGE_MASK);
+	endbase = PAGE_OFFSET + 0x9f000;
 	while (start_low_mem < endbase) {
 		clear_bit(PG_reserved, &mem_map[MAP_NR(start_low_mem)].flags);
 		start_low_mem += PAGE_SIZE;

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