Merge lp:~lfaraone/ubuntu/maverick/memtest86+/4.10-1ubuntu1 into lp:ubuntu/maverick/memtest86+

[Luke Faraone]

=== modified file 'Makefile'
--- Makefile	2009-11-09 17:09:57 +0000
+++ Makefile	2010-06-27 17:51:29 +0000
@@ -13,9 +13,14 @@
 
 CFLAGS= -Wall -march=i486 -m32 -O2 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector
 
+# This reverts a change introduced with recent binutils (post
+# http://sourceware.org/bugzilla/show_bug.cgi?id=10569).  Needed to
+# ensure Multiboot header is within the limit offset.
+LD += -z max-page-size=0x1000
+
 OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
       config.o linuxbios.o memsize.o pci.o controller.o random.o spd.o \
-      error.o dmi.o cpuid.o
+      error.o dmi.o cpuid.o multiboot.o
 
 all: memtest.bin memtest
 
 
=== modified file 'README'
--- README	2009-09-29 23:40:15 +0000
+++ README	2010-06-27 17:51:29 +0000
@@ -1,4 +1,4 @@
-Memtest86++ v4.00
+Memtest86++ v4.10
 ====================
 
 Table of Contents
 
=== modified file 'changelog'
--- changelog	2009-11-09 17:09:57 +0000
+++ changelog	2010-06-27 17:51:29 +0000
@@ -1,19 +1,11 @@
-Memtest86+ V4.00 changelog
+Memtest86+ V4.10 changelog
 --------------------------
 
-  - Major Architectural changes
-  - First pass twice faster (reduced iterations)
-  - Detect DDR2/3 brands and part numbers
-  - Corrected detection for Intel "Lynnfield" CPU
-  - Added detection for Intel "Clarkdale" CPU
-  - Added detection for Intel "Gulftown" CPU
-  - Corrected detection for AMD 45nm K10 CPU
-  - Added detection for AMD "Magny-Cours" CPU
-  - Solved crash with AMD Geode LX
-  - Added detection for Intel XMP Memory
-  - Added for CPU w/ 0.5/1.5/3/6/12/16/18/24MB L3
-  - Added "clean" DMI detection for DDR3/FBDIMM2 
-  - Better detection of Integrated Memory Ctrl
-  - Complies with SMBIOS 2.6.1 specs
-  - Fixed compilation issues with gcc 4.2+
-  - Many others bug fixes
+	- Added support for Core i7 Extreme CPU (32nm)
+	- Added support for Core i5/i3 (32 nm)
+	- Added support for Pentium Gxxxx (32 mn)
+	- Added support for Westmere-based Xeon
+	- Added preliminary support for Intel Sandy Bridge
+	- Added support for AMD 6-cores CPU
+	- Added detection for Intel 3200/3210
+  - Many bug fixes
 
=== modified file 'controller.c'
--- controller.c	2009-11-09 17:09:57 +0000
+++ controller.c	2010-06-27 17:51:29 +0000
@@ -16,6 +16,7 @@
 #include "spd.h"
 #include "test.h"
 
+
 int col, col2;
 int nhm_bus = 0x3F;
 	
@@ -160,6 +161,8 @@
 	col2 += 1;
 }
 
+
+
 static void poll_fsb_nothing(void)
 {
 /* Code to run for no specific fsb detection */
@@ -187,6 +190,23 @@
 	return;
 }
 
+static void setup_wmr(void)
+{
+
+	// Activate MMR I/O
+	ulong dev0;
+	ctrl.cap = ECC_CORRECT;
+	
+	pci_conf_read( 0, 0, 0, 0x48, 4, &dev0);
+	if (!(dev0 & 0x1)) {
+		pci_conf_write( 0, 0, 0, 0x48, 1, dev0 | 1);
+	}
+
+	ctrl.mode = ECC_NONE; 
+	
+}
+
+
 static void setup_nhm(void)
 {
 	static float possible_nhm_bus[] = {0xFF, 0x7F, 0x3F};
@@ -204,7 +224,7 @@
 		pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did);
 		vid &= 0xFFFF;
 		did &= 0xFF00;
-		if(vid == 0x8086 && did == 0x2C00) { 
+		if(vid == 0x8086 && did >= 0x2C00) { 
 			nhm_bus = possible_nhm_bus[i]; 
 			}
 }
@@ -223,6 +243,41 @@
 	
 }
 
+static void setup_nhm32(void)
+{
+	static float possible_nhm_bus[] = {0xFF, 0x7F, 0x3F};
+	unsigned long did, vid, mc_control, mc_ssrcontrol;
+	int i;
+	
+	//Nehalem supports Scrubbing */
+	ctrl.cap = ECC_SCRUB;
+	ctrl.mode = ECC_NONE;
+
+	/* First, locate the PCI bus where the MCH is located */
+
+	for(i = 0; i < sizeof(possible_nhm_bus); i++) {
+		pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid);
+		pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did);
+		vid &= 0xFFFF;
+		did &= 0xFF00;
+		if(vid == 0x8086 && did >= 0x2C00) { 
+			nhm_bus = possible_nhm_bus[i]; 
+			}
+}
+
+	/* Now, we have the last IMC bus number in nhm_bus */
+	/* Check for ECC & Scrub */
+	pci_conf_read(nhm_bus, 3, 0, 0x48, 2, &mc_control);	
+	if((mc_control >> 1) & 1) { 
+		ctrl.mode = ECC_CORRECT; 
+		pci_conf_read(nhm_bus, 3, 2, 0x48, 2, &mc_ssrcontrol);	
+		if(mc_ssrcontrol & 1) { 
+			ctrl.mode = ECC_SCRUB; 
+		}		
+	}
+	
+}
+
 static void setup_amd64(void)
 {
 
@@ -1175,6 +1230,58 @@
 	return coef;
 }
 
+
+void getIntelPNS(void)
+{
+	int i,j;
+	long psn_eax, psn_ebx, psn_ecx, psn_edx;
+	long char_hex;
+	long ocpuid = 0x80000002;
+
+	for(j = 0; j < 4; j++)
+	{
+
+		asm __volatile__(
+			"pushl %%ebx\n\t" \
+			"cpuid\n\t" \
+			"movl %%ebx, %1\n\t" \
+			"popl %%ebx\n\t" \
+			: "=a" (psn_eax), "=r" (psn_ebx), "=c" (psn_ecx), "=d" (psn_edx)
+			: "a" (ocpuid)
+			: "cc"
+		);
+		
+
+		for(i = 0; i < 4; i++)
+		{
+			char_hex = (psn_eax >> (i*8)) & 0xff;
+			cprint(LINE_CPU+5, col + i, convert_hex_to_char(char_hex));
+	
+			char_hex = (psn_ebx >> (i*8)) & 0xff;
+			cprint(LINE_CPU+5, col + i + 4, convert_hex_to_char(char_hex));
+			
+			if(psn_ecx != 0x20202020)
+			{
+				char_hex = (psn_ecx >> (i*8)) & 0xff;
+				cprint(LINE_CPU+5, col + i + 8, convert_hex_to_char(char_hex));
+							
+				char_hex = (psn_edx >> (i*8)) & 0xff;
+				cprint(LINE_CPU+5, col + i + 12, convert_hex_to_char(char_hex));
+			}
+			else 
+			{
+				char_hex = (psn_edx >> (i*8)) & 0xff;
+				cprint(LINE_CPU+5, col + i + 8, convert_hex_to_char(char_hex));				
+			}
+		}
+		(psn_ecx != 0x20202020)?(col += 16):(col +=12);
+		if(psn_edx == 0x20202020) { col -= 4; }
+		ocpuid++;
+	}
+	
+	col -= 16;
+}
+
 static void poll_fsb_amd64(void) {
 
 	unsigned int mcgsrl;
@@ -2092,6 +2199,98 @@
 
 }
 
+static void poll_fsb_nhm32(void) {
+
+	double dramclock, dramratio, fsb;
+	unsigned long mc_dimm_clk_ratio, qpi_pll_status;
+	float coef = getNHMmultiplier();
+	float qpi_speed;
+
+	fsb = ((extclock /1000) / coef);
+
+	/* Print FSB */
+	cprint(LINE_CPU+5, col +1, "/ BCLK : ");
+	col += 10;
+	dprint(LINE_CPU+5, col, fsb, 3,0);
+	col += 3;
+	cprint(LINE_CPU+5, col +1, "MHz");
+	col += 4;
+	
+	/* Print QPI Speed (if ECC not supported) */
+	if(ctrl.mode == ECC_NONE && cpu_id.model == 12) {
+		pci_conf_read(nhm_bus, 2, 1, 0x50, 2, &qpi_pll_status);
+		qpi_speed = (qpi_pll_status & 0x7F) * ((extclock / 1000) / coef) * 2;
+		cprint(LINE_CPU+5, col +1, "/ QPI : ");
+		col += 9;
+		dprint(LINE_CPU+5, col, qpi_speed/1000, 1,0);
+		col += 1;
+		cprint(LINE_CPU+5, col, ".");
+		col += 1;		
+		qpi_speed = ((qpi_speed / 1000) - (int)(qpi_speed / 1000)) * 10;
+		dprint(LINE_CPU+5, col, qpi_speed, 1,0);
+		col += 1;		
+		cprint(LINE_CPU+5, col +1, "GT/s");
+		col += 5;	
+	}
+	
+	/* Get the clock ratio */
+	
+	pci_conf_read(nhm_bus, 3, 4, 0x50, 2, &mc_dimm_clk_ratio);
+	dramratio = (mc_dimm_clk_ratio & 0x1F);
+	
+	// Compute RAM Frequency
+	fsb = ((extclock / 1000) / coef);
+	dramclock = fsb * dramratio / 2;
+
+	// Print DRAM Freq
+	print_fsb_info(dramclock, "RAM : ", "DDR3-");
+
+}
+
+static void poll_fsb_wmr(void) {
+
+	double dramclock, dramratio, fsb;
+	unsigned long dev0, mchcfg;
+	float coef = getNHMmultiplier();
+	long *ptr;
+	
+	fsb = ((extclock / 1000) / coef);
+
+	if(ctrl.mode == ECC_NONE)
+		{
+			col = 0;
+			cprint(LINE_CPU+5, col, "IMC : "); col += 6;
+			getIntelPNS();	
+			//cprint(LINE_CPU+5, col, "(ECC : Disabled)");
+			//col += 16;
+		}
+
+	/* Print FSB */
+	cprint(LINE_CPU+5, col +1, "/ BCLK : ");
+	col += 10;
+	dprint(LINE_CPU+5, col, fsb, 3,0);
+	col += 3;
+	cprint(LINE_CPU+5, col +1, "MHz");
+	col += 4;
+
+	/* Find dramratio */
+	pci_conf_read( 0, 0, 0, 0x48, 4, &dev0);
+	dev0 &= 0xFFFFC000;
+	ptr=(long*)(dev0+0x2C20);
+	mchcfg = *ptr & 0xFFFF;
+	dramratio = 1;
+	
+	/* Get the clock ratio */
+	dramratio = 0.25 * (float)(*ptr & 0x1F);
+	
+	// Compute RAM Frequency
+	dramclock = fsb * dramratio;
+
+	// Print DRAM Freq
+	print_fsb_info(dramclock, "RAM : ", "DDR3-");
+
+}
+
 /* ------------------ Here the code for Timings detection ------------------ */
 /* ------------------------------------------------------------------------- */
 
@@ -2484,6 +2683,71 @@
 
 }
 
+static void poll_timings_wmr(void) {
+
+	float cas;
+	int rcd, rp, ras;
+	ulong dev0, c0ckectrl, c1ckectrl, offset;
+	ulong ODT_Control_Register, Precharge_Register, ACT_Register, Read_Register, MRC_Register;
+	long *ptr;
+
+	//Now, read MMR Base Address
+	pci_conf_read( 0, 0, 0, 0x48, 4, &dev0);
+	dev0 &= 0xFFFFC000;
+
+	ptr = (long*)(dev0+0x260);
+	c0ckectrl = *ptr & 0xFFFFFFFF;	
+
+	ptr = (long*)(dev0+0x660);
+	c1ckectrl = *ptr & 0xFFFFFFFF;
+	
+	// If DIMM 0 not populated, check DIMM 1
+	((c0ckectrl) >> 20 & 0xF)?(offset = 0):(offset = 0x400);
+
+	ptr = (long*)(dev0+offset+0x265);
+	ODT_Control_Register = *ptr & 0xFFFFFFFF;
+
+	ptr = (long*)(dev0+offset+0x25D);	
+	Precharge_Register = *ptr & 0xFFFFFFFF;
+
+	ptr = (long*)(dev0+offset+0x252);
+	ACT_Register = *ptr & 0xFFFFFFFF;
+
+	ptr = (long*)(dev0+offset+0x258);
+	Read_Register = *ptr & 0xFFFFFFFF;
+
+	ptr = (long*)(dev0+offset+0x240);
+	MRC_Register = *ptr & 0xFFFFFFFF;
+
+	// CAS Latency (tCAS)
+	if(MRC_Register & 0xF) {
+		cas = (MRC_Register & 0xF) + 3.0f;
+	} else {
+		cas = ((ODT_Control_Register >> 8)& 0x3F) - 5.0f;
+	}
+
+	// RAS-To-CAS (tRCD)
+	rcd = (Read_Register >> 17) & 0xF;
+
+	// RAS Precharge (tRP)
+	rp = (ACT_Register >> 13) & 0xF;
+
+	// RAS Active to precharge (tRAS)
+	ras = Precharge_Register & 0x3F;
+	
+	print_timings_info(cas, rcd, rp, ras);
+
+	cprint(LINE_CPU+6, col2+1, "/"); col2 +=2;
+
+	if ((c0ckectrl >> 20 & 0xF) && (c1ckectrl >> 20 & 0xF)) { 
+		cprint(LINE_CPU+6, col2+1, "Dual Channel"); 
+	}	else {
+		cprint(LINE_CPU+6, col2+1, "Single Channel"); 
+	}
+
+}
+
+
 static void poll_timings_5400(void) {
 
 	// Thanks for CDH optis
@@ -2938,7 +3202,7 @@
 		fvc_bn = 4; 
 	} else if(mc_control & 2) { 
 		fvc_bn = 5; 
-	}	else if(mc_control & 7) { 
+	}	else if(mc_control & 4) { 
 		fvc_bn = 6; 
 	}
 
@@ -3098,6 +3362,7 @@
 	{ 0x8086, 0x29C0, "Intel P35/G33", 	 		0, poll_fsb_i965, poll_timings_p35, setup_p35, poll_nothing},	
 	{ 0x8086, 0x29D0, "Intel Q33",	  	 		0, poll_fsb_i965, poll_timings_p35, setup_p35, poll_nothing},	
 	{ 0x8086, 0x29E0, "Intel X38/X48", 	 		0, poll_fsb_i965, poll_timings_p35, setup_p35, poll_nothing},			
+	{ 0x8086, 0x29F0, "Intel 3200/3210", 		0, poll_fsb_i965, poll_timings_p35, setup_p35, poll_nothing},	
 	{ 0x8086, 0x2E10, "Intel Q45/Q43", 	 		0, poll_fsb_i965, poll_timings_p35, setup_p35, poll_nothing},	
 	{ 0x8086, 0x2E20, "Intel P45/G45",	  	0, poll_fsb_i965, poll_timings_p35, setup_p35, poll_nothing},	
 	{ 0x8086, 0x2E30, "Intel G41", 	 				0, poll_fsb_i965, poll_timings_p35, setup_p35, poll_nothing},	
@@ -3113,7 +3378,8 @@
 
 	/* Integrated Memory Controllers */
 	{ 0xFFFF, 0x0001, "Core IMC", 	 				0, poll_fsb_nhm, 	poll_timings_nhm, setup_nhm, poll_nothing},
-	{ 0xFFFF, 0x0002, "Core IMC2", 	 				0, poll_fsb_nhm, 	poll_timings_nothing, setup_nhm, poll_nothing},
+	{ 0xFFFF, 0x0002, "Core IMC 32nm", 	 		0, poll_fsb_nhm32, 	poll_timings_nhm, setup_nhm32, poll_nothing},
+	{ 0xFFFF, 0x0003, "Core IMC 32nm", 	 		0, poll_fsb_wmr, 	poll_timings_wmr, setup_wmr, poll_nothing},
 	{ 0xFFFF, 0x0100, "AMD K8 IMC",					0, poll_fsb_amd64, poll_timings_amd64, setup_amd64, poll_amd64 },
 	{ 0xFFFF, 0x0101, "AMD K10 IMC",			  0, poll_fsb_k10, poll_timings_k10, setup_k10, poll_nothing }
 	
 
=== modified file 'debian/README.Debian'
--- debian/README.Debian	2008-11-13 10:37:16 +0000
+++ debian/README.Debian	2010-06-27 17:51:29 +0000
@@ -1,12 +1,18 @@
 memtest86+ for Debian
 ---------------------
 
-Binary image is /boot/memtest86+.bin
-
-It is automatically registered against grub2.  For other bootloaders
-you'll need to do some manual setup (see examples/grub-menu.lst for
-GRUB Legacy or examples/lilo.conf for LILO), or to make a boot-floppy,
-and reboot on this image.
+Two binary images are provided:
+
+  - A legacy /boot/memtest86+.bin that uses Linux zImage boot
+    protocol.
+
+  - A Multiboot /boot/memtest86+_multiboot.bin image that follows the
+    Multiboot specification.
+
+memtest86+_multiboot.bin is automatically registered against grub2.  For
+other bootloaders you'll need to do some manual setup (see
+examples/grub-menu.lst for GRUB Legacy or examples/lilo.conf for LILO),
+or to make a boot-floppy, and reboot on this image.
 
 The make-memtest86+-boot-floppy utility will help you to create a
 boot floppy or floppy image using GRUB Legacy.
 
=== modified file 'debian/changelog'
--- debian/changelog	2010-03-23 09:33:34 +0000
+++ debian/changelog	2010-06-27 17:51:29 +0000
@@ -1,3 +1,62 @@
+memtest86+ (4.10-1ubuntu1) maverick; urgency=low
+
+  * Merge from Debian unstable. (LP: #599070) Remaining changes:
+    - Only run update-grub in the postrm on remove/purge.
+    - Update maintainer field.
+
+ -- Luke Faraone <[e-mail]>  Sun, 27 Jun 2010 12:54:15 -0400
+
+memtest86+ (4.10-1) unstable; urgency=low
+
+  * The "not yet source format 3.0" release.
+  * New upstream release (Closes: #586727).
+    * supports 64 e820 lines (Closes: #567165).
+  * Acknowledge NMUs (Closes: #565642).
+  * Don't emit grub2 menu items if /boot is on a loop-mounted device
+    (Ubuntu, Closes: 574788).
+  * Cache results of prepare_grub_to_access_device to speed up update-grub
+    runs (Ubuntu, Closes: #570987).
+  * Fix typo in package description (Robert Tomsick, Closes: #580147).
+  * Suggest "grub-pc | grub-legacy" instead of old "grub2 | grub" (Closes:
+    #568624).
+  * Include es.po for po-debconf (Francisco Javier Cuadrado, Closes:
+    #580953).
+  * Provide boot entries for non-multiboot image, and tag the multiboot
+    ones as experimental (mitigates #570499).
+  * Install elf image again (was silently dropped in -2.2).
+  * Bumped Standards-Version to 3.8.4, no change.
+
+ -- Yann Dirson <[e-mail]>  Sun, 27 Jun 2010 15:16:43 +0200
+
+memtest86+ (4.00-2.3) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Check for grub.cfg in postinst. Closes: #550337
+
+ -- Michal Suchanek <[e-mail]>  Fri, 04 Jun 2010 13:50:53 +0200
+
+memtest86+ (4.00-2.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Build an image with Multiboot support.  (Closes: #250864)
+  * Update de.po, fr.po, ja.po, pt.po, ru.po and sv.po.
+    (Closes: #563019, #563288, #564291, #564430, #564470, #565169)
+  * Fix in copyright line in debian/copyright to make lintian happy.
+
+ -- Robert Millan <[e-mail]>  Sun, 17 Jan 2010 17:06:16 +0100
+
+memtest86+ (4.00-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Replace manual propt with debconf (Closes: #553292).
+  * Fix ".: 4: Can't open /usr/lib/grub/grub-mkconfig_lib" by checking
+    both grub files and also changing the linux/linux16 grub command based
+    on which version we find (Closes: #550096)
+  * Update suggests to a recent version of grub2
+  * Add a lintian override for statically-linked-binary (which is expected)
+
+ -- Iustin Pop <[e-mail]>  Sun, 06 Dec 2009 12:20:39 +0100
+
 memtest86+ (4.00-2ubuntu3) lucid; urgency=low
 
   * Only run update-grub in the postrm on remove/purge.
 
=== added file 'debian/config'
--- debian/config	1970-01-01 00:00:00 +0000
+++ debian/config	2010-06-27 17:51:29 +0000
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+db_input medium shared/memtest86-run-lilo || true
+db_go || true
+
+#DEBHELPER#
 
=== modified file 'debian/control'
--- debian/control	2009-03-26 11:45:00 +0000
+++ debian/control	2010-06-27 17:51:29 +0000
@@ -1,16 +1,17 @@
 Source: memtest86+
 Section: misc
 Priority: optional
-Maintainer: Ubuntu Core Developers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Yann Dirson <[e-mail]>
-Build-Depends: debhelper (>> 5.0.0), dh-buildinfo, gcc-multilib [amd64 kfreebsd-amd64]
+Build-Depends: debhelper (>> 5.0.0), dh-buildinfo, gcc-multilib [amd64 kfreebsd-amd64],
+ po-debconf
 Homepage: http://www.memtest.org/
-Standards-Version: 3.8.0
+Standards-Version: 3.8.4
 
 Package: memtest86+
 Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 lpia hurd-i386
 Depends: ${misc:Depends}
-Suggests: hwtools, memtester, kernel-patch-badram, memtest86, grub2 (>=1.95+20070515-1) | grub (>= 0.95+cvs20040624), mtools
+Suggests: hwtools, memtester, kernel-patch-badram, memtest86, grub-pc | grub-legacy, mtools
 Description: thorough real-mode memory tester
  Memtest86+ scans your RAM for errors.
  .
@@ -20,7 +21,7 @@
  but this one won't be able to test your whole RAM.
  .
  It can output a list of bad RAM regions usable by the BadRAM kernel
- patch, so that you can still use you old RAM with one or two bad bits.
+ patch, so that you can still use your old RAM with one or two bad bits.
  .
  Memtest86+ is based on memtest86 3.0, and adds support for recent
  hardware, as well as a number of general-purpose improvements,
 
=== modified file 'debian/copyright'
--- debian/copyright	2009-03-26 11:45:00 +0000
+++ debian/copyright	2010-06-27 17:51:29 +0000
@@ -2,8 +2,9 @@
 
 It was downloaded from http://www.memtest.org/
 
-Upstream Author: Samuel Demeulemeester <[e-mail]>, based on
-memtest86 by Chris Brady <[e-mail]>, and various contributors.
+Copyright (C) 2004,2005,2007,2009 by Samuel Demeulemeester
+<[e-mail]>, based on memtest86 by Chris Brady
+<[e-mail]>, and various contributors.
 
 License:
 
 
=== modified file 'debian/grub'
--- debian/grub	2010-02-22 16:06:06 +0000
+++ debian/grub	2010-06-27 17:51:29 +0000
@@ -1,37 +1,59 @@
 #!/bin/sh
 set -e
 
-# older versions of grub2 do not have this yet (LP: #459080)
-if [ ! -e /usr/lib/grub/grub-mkconfig_lib ]; then
-    echo "no grub-mkconfig_lib, exiting"
-    exit 0
+if [ -f /usr/lib/grub/grub-mkconfig_lib ]; then
+  . /usr/lib/grub/grub-mkconfig_lib
+  LX=linux16
+elif [ -f /usr/lib/grub/update-grub_lib ]; then
+  . /usr/lib/grub/update-grub_lib
+  LX=linux
+else
+  # no grub file, so we notify and exit gracefully
+  echo "Cannot find grub config file, exiting." >&2
+  exit 0
 fi
 
-. /usr/lib/grub/grub-mkconfig_lib
-
 # We can't cope with loop-mounted devices here.
 case ${GRUB_DEVICE_BOOT} in
-  /dev/loop/*|/dev/loop[0-9])
-    exit 0
-  ;;
+  /dev/loop/*|/dev/loop[0-9]) exit 0 ;;
 esac
 
+prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
+
 if test -e /boot/memtest86+.bin ; then
   MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest86+.bin" )
   echo "Found memtest86+ image: $MEMTESTPATH" >&2
   cat << EOF
 menuentry "Memory test (memtest86+)" {
 EOF
-  prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
   printf '%s\n' "${prepare_boot_cache}"
   cat << EOF
-	linux16	$MEMTESTPATH
+	$LX	$MEMTESTPATH
 }
 menuentry "Memory test (memtest86+, serial console 115200)" {
 EOF
   printf '%s\n' "${prepare_boot_cache}"
   cat << EOF
-	linux16	$MEMTESTPATH console=ttyS0,115200n8
+	$LX	$MEMTESTPATH console=ttyS0,115200n8
+}
+EOF
+fi
+
+if test -e /boot/memtest86+_multiboot.bin ; then
+  MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest86+_multiboot.bin" )
+  echo "Found memtest86+ multiboot image: $MEMTESTPATH" >&2
+  cat << EOF
+menuentry "Memory test (memtest86+, experimental multiboot)" {
+EOF
+  printf '%s\n' "${prepare_boot_cache}"
+  cat << EOF
+	multiboot	$MEMTESTPATH
+}
+menuentry "Memory test (memtest86+, serial console 115200, experimental multiboot)" {
+EOF
+  printf '%s\n' "${prepare_boot_cache}"
+  cat << EOF
+	multiboot	$MEMTESTPATH console=ttyS0,115200n8
 }
 EOF
 fi
 
=== added file 'debian/lintian-overrides'
--- debian/lintian-overrides	1970-01-01 00:00:00 +0000
+++ debian/lintian-overrides	2010-06-27 17:51:29 +0000
@@ -0,0 +1,3 @@
+# This file is intended to be statically-linked
+memtest86+: statically-linked-binary ./usr/lib/memtest86+/memtest86+.elf
+memtest86+: shared-lib-without-dependency-information ./boot/memtest86+_multiboot.bin
 
=== added directory 'debian/po'
=== added file 'debian/po/POTFILES.in'
--- debian/po/POTFILES.in	1970-01-01 00:00:00 +0000
+++ debian/po/POTFILES.in	2010-06-27 17:51:29 +0000
@@ -0,0 +1,1 @@
+[type: gettext/rfc822deb] templates
 
=== added file 'debian/po/de.po'
--- debian/po/de.po	1970-01-01 00:00:00 +0000
+++ debian/po/de.po	2010-06-27 17:51:29 +0000
@@ -0,0 +1,37 @@
+# Translation of po-debconf template to German
+# This file is distributed under the same license as the memtest86+ package.
+#
+# Thomas Mueller <[e-mail]>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: memtest86+ 4.00\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2009-12-02 22:23+0100\n"
+"PO-Revision-Date: 2010-01-01 19:47+0100\n"
+"Last-Translator: Thomas Mueller <[e-mail]>\n"
+"Language-Team: German <[e-mail]>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Run lilo automatically after upgrade (if found)?"
+msgstr ""
+"Soll lilo nach dem Upgrade automatisch ausgeführt werden (falls vorhanden)?"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"If lilo is installed and its configuration file contains the memtest86/"
+"memtest86+ image, then it should be re-run in order to allow booting the new "
+"image."
+msgstr ""
+"Falls lilo installiert ist und dessen Konfigurationsdatei das memtest86/"
+"memtest86+-Image enthält, dann sollte es erneut ausgeführt werden, damit das "
+"Booten des neuen Images möglich ist."
 
=== added file 'debian/po/es.po'
--- debian/po/es.po	1970-01-01 00:00:00 +0000
+++ debian/po/es.po	2010-06-27 17:51:29 +0000
@@ -0,0 +1,58 @@
+# memtest86+ po-debconf translation to Spanish
+# Copyright (C) 2010 Software in the Public Interest
+# This file is distributed under the same license as the memtest86+ package.
+#
+# Changes:
+#   - Initial translation
+#       Francisco Javier Cuadrado <[e-mail]>, 2010
+#
+# Traductores, si no conocen el formato PO, merece la pena leer la
+# documentación de gettext, especialmente las secciones dedicadas a este
+# formato, por ejemplo ejecutando:
+#       info -n '(gettext)PO Files'
+#       info -n '(gettext)Header Entry'
+#
+# Equipo de traducción al español, por favor lean antes de traducir
+# los siguientes documentos:
+#
+#   - El proyecto de traducción de Debian al español
+#     http://www.debian.org/intl/spanish/
+#     especialmente las notas y normas de traducción en
+#     http://www.debian.org/intl/spanish/notas
+#
+#   - La guía de traducción de po's de debconf:
+#     /usr/share/doc/po-debconf/README-trans
+#     o http://www.debian.org/intl/l10n/po-debconf/README-trans
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: memtest86+ 4.00-2.2\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2009-12-02 22:23+0100\n"
+"PO-Revision-Date: 2010-04-28 10:10+0200\n"
+"Last-Translator: Francisco Javier Cuadrado <[e-mail]>\n"
+"Language-Team: Debian l10n Spanish <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Run lilo automatically after upgrade (if found)?"
+msgstr ""
+"¿Desea ejecutar automáticamente lilo después de la actualización (si se "
+"encuentra)?"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"If lilo is installed and its configuration file contains the memtest86/"
+"memtest86+ image, then it should be re-run in order to allow booting the new "
+"image."
+msgstr ""
+"Si lilo está instalado y su archivo de configuración contiene la imagen de "
+"«memtest86»/«memtest86+» vuelva a ejecutar lilo para que pueda arrancar la "
+"nueva imagen."
 
=== added file 'debian/po/fr.po'
--- debian/po/fr.po	1970-01-01 00:00:00 +0000
+++ debian/po/fr.po	2010-06-27 17:51:29 +0000
@@ -0,0 +1,38 @@
+# Translation of memtest86 debconf templates to French
+# Copyright (C) 2010 Debian French l10n team <[e-mail]>
+# This file is distributed under the same license as the memtest86 package.
+#
+# Translators:
+# Christian Perrier <[e-mail]>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2009-12-02 22:23+0100\n"
+"PO-Revision-Date: 2010-01-02 18:44+0100\n"
+"Last-Translator: Christian Perrier <[e-mail]>\n"
+"Language-Team: French <[e-mail]>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Run lilo automatically after upgrade (if found)?"
+msgstr "Faut-il exécuter lilo automatiquement après la mise à jour ?"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"If lilo is installed and its configuration file contains the memtest86/"
+"memtest86+ image, then it should be re-run in order to allow booting the new "
+"image."
+msgstr ""
+"Si LILO est installé et que son fichier de configuration fait référence à "
+"une image de lancement de memtest86 ou memtest86+, il doit être ré-exécuté "
+"afin de pouvoir utiliser la nouvelle image."
 
=== added file 'debian/po/ja.po'
--- debian/po/ja.po	1970-01-01 00:00:00 +0000
+++ debian/po/ja.po	2010-06-27 17:51:29 +0000
@@ -0,0 +1,35 @@
+# memtest86+ po-debconf translation (Japanese)
+# Copyright (C) 2009 Yann Dirson <[e-mail]>
+# This file is distributed under the same license as the memtest86+ package.
+# Hideki Yamane (Debian-JP) <[e-mail]>, 2009.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: memtest86+ 4.00-2.1\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2009-12-02 22:23+0100\n"
+"PO-Revision-Date: 2009-12-27 13:52+0900\n"
+"Last-Translator: Hideki Yamane (Debian-JP) <[e-mail]>\n"
+"Language-Team: Japanese <[e-mail]>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Run lilo automatically after upgrade (if found)?"
+msgstr "(もしあれば) lilo をアップグレード後に自動的に実行しますか?"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"If lilo is installed and its configuration file contains the memtest86/"
+"memtest86+ image, then it should be re-run in order to allow booting the new "
+"image."
+msgstr ""
+"lilo がインストールされていて、その設定ファイルが memtest86/memtest86+ のイ"
+"メージを指定している場合は、新しいイメージを起動できるようにするために lilo "
+"の再実行が必要です。"
 
=== added file 'debian/po/pt.po'
--- debian/po/pt.po	1970-01-01 00:00:00 +0000
+++ debian/po/pt.po	2010-06-27 17:51:29 +0000
@@ -0,0 +1,37 @@
+# Translation of memtest86+ debconf messages to Portuguese
+# Copyright (C) 2009 the memtest86+ copyright holder
+# This file is distributed under the same license as the memtest86+ package.
+#
+# Américo Monteiro <[e-mail]>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: memtest86+ 4.00-2.1\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2009-12-02 22:23+0100\n"
+"PO-Revision-Date: 2009-12-28 20:18+0000\n"
+"Last-Translator: Américo Monteiro <[e-mail]>\n"
+"Language-Team: Portuguese <[e-mail]>\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Run lilo automatically after upgrade (if found)?"
+msgstr "Correr o lilo automaticamente (se encontrado) após a actualização?"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"If lilo is installed and its configuration file contains the memtest86/"
+"memtest86+ image, then it should be re-run in order to allow booting the new "
+"image."
+msgstr ""
+"Se o lilo estiver instalado e o seu ficheiro de configuração conter a imagem "
+"memtest86/memtest86+, então deve ser re-executado de modo a permitir o "
+"arranque pela nova imagem."
 
=== added file 'debian/po/ru.po'
--- debian/po/ru.po	1970-01-01 00:00:00 +0000
+++ debian/po/ru.po	2010-06-27 17:51:29 +0000
@@ -0,0 +1,37 @@
+# translation of memtest86+_4.00-2.1_ru.po to Russian
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Yuri Kozlov <[e-mail]>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: memtest86+ 4.00-2.1\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2009-12-02 22:23+0100\n"
+"PO-Revision-Date: 2010-01-13 19:22+0300\n"
+"Last-Translator: Yuri Kozlov <[e-mail]>\n"
+"Language-Team: Russian <[e-mail]>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Run lilo automatically after upgrade (if found)?"
+msgstr "Запускать lilo автоматически после обновления (если установлен)?"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"If lilo is installed and its configuration file contains the memtest86/"
+"memtest86+ image, then it should be re-run in order to allow booting the new "
+"image."
+msgstr ""
+"Если пакет lilo установлен и его файл настройки содержит образ memtest86/"
+"memtest86+, то его нужно перезапустить, чтобы стал загружаться новый образ."
 
=== added file 'debian/po/sv.po'
--- debian/po/sv.po	1970-01-01 00:00:00 +0000
+++ debian/po/sv.po	2010-06-27 17:51:29 +0000
@@ -0,0 +1,37 @@
+# Translation of memtest86+ debconf template to Swedish
+# Copyright (C) 2010 Martin Bagge <[e-mail]>
+# This file is distributed under the same license as the memtest86+ package.
+#
+# Martin Bagge <[e-mail]>, 2010
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2009-12-02 22:23+0100\n"
+"PO-Revision-Date: 2010-01-09 19:01+0100\n"
+"Last-Translator: Martin Bagge <[e-mail]>\n"
+"Language-Team: Swedish <[e-mail]>\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Swedish\n"
+"X-Poedit-Country: Sweden\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Run lilo automatically after upgrade (if found)?"
+msgstr "Ska lilo (om det finns) köras automatiskt efter uppgradering?"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"If lilo is installed and its configuration file contains the memtest86/"
+"memtest86+ image, then it should be re-run in order to allow booting the new "
+"image."
+msgstr ""
+"Om lilo är installerat och dess inställningar innehållet avbildningen av "
+"memtest86/memtest86+ ska den köras för att systemet ska kunna startas på den "
+"nya avbildningen."
 
=== added file 'debian/po/templates.pot'
--- debian/po/templates.pot	1970-01-01 00:00:00 +0000
+++ debian/po/templates.pot	2010-06-27 17:51:29 +0000
@@ -0,0 +1,32 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2009-12-02 22:23+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid "Run lilo automatically after upgrade (if found)?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../templates:1001
+msgid ""
+"If lilo is installed and its configuration file contains the memtest86/"
+"memtest86+ image, then it should be re-run in order to allow booting the new "
+"image."
+msgstr ""
 
=== modified file 'debian/postinst'
--- debian/postinst	2009-06-24 16:55:39 +0000
+++ debian/postinst	2010-06-27 17:51:29 +0000
@@ -1,23 +1,20 @@
 #!/bin/sh
 set -e
 
-# offer to run LILO
-# (adapted from snippet by [e-mail])
-if [ -x /sbin/lilo ] && [ -r /etc/lilo.conf ] && 
-	[ "${DEBIAN_FRONTEND}" != "noninteractive" ] &&
+. /usr/share/debconf/confmodule
+
+if [ "$1" = configure ]; then
+    db_get shared/memtest86-run-lilo
+    if [ "$RET" = true ] &&
+	[ -x /sbin/lilo ] && [ -r /etc/lilo.conf ] &&
 	grep "image.*=.*/boot/memtest86+.bin" /etc/lilo.conf >/dev/null
-then
-    echo "You seem to have an entry for memtest86+ in /etc/lilo.conf."
-    printf "Run lilo now [y/N]? "
-    read c
-    if [ "$c" = "y" ] || [ "$c" = "Y" ]
     then
 	lilo
     fi
-fi
 
-if [ "$1" = "configure" ] && [ -x "`which update-grub2 2>/dev/null`" ] && [ -e /boot/grub/grub.cfg ]; then
-    update-grub2
+    if [ -e /boot/grub/grub.cfg ] && [ -x "`which update-grub2 2>/dev/null`" ] ; then
+	update-grub2
+    fi
 fi
 
 #DEBHELPER#
 
=== modified file 'debian/rules'
--- debian/rules	2009-03-26 11:45:00 +0000
+++ debian/rules	2010-06-27 17:51:29 +0000
@@ -23,6 +23,9 @@
 
 	[ ! -f Makefile ] || $(MAKE) clean
 
+	# make sure PO files are always up-to-date
+	debconf-updatepo
+
 	dh_clean
 
 install: build
@@ -35,8 +38,13 @@
 	install -m755 debian/make-$(PACKAGE)-boot-floppy debian/$(PACKAGE)/usr/bin/
 	install -D -m644 memtest.bin debian/$(PACKAGE)/boot/$(PACKAGE).bin
 	install -D -m644 memtest debian/$(PACKAGE)/usr/lib/$(PACKAGE)/$(PACKAGE).elf
+	install -D -m644 -s memtest_shared debian/$(PACKAGE)/boot/$(PACKAGE)_multiboot.bin
 	install -D -m755 debian/grub debian/$(PACKAGE)/etc/grub.d/20_$(PACKAGE)
 	dh_installman debian/make-$(PACKAGE)-boot-floppy.1
+	#install the lintian override
+	install -d debian/$(PACKAGE)/usr/share/lintian/overrides
+	install -m644 debian/lintian-overrides \
+		debian/$(PACKAGE)/usr/share/lintian/overrides/$(PACKAGE)
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -46,7 +54,7 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-#	dh_installdebconf
+	dh_installdebconf
 	dh_installdocs README
 	dh_buildinfo
 	dh_installexamples debian/lilo.conf debian/grub-menu.lst
 
=== added file 'debian/templates'
--- debian/templates	1970-01-01 00:00:00 +0000
+++ debian/templates	2010-06-27 17:51:29 +0000
@@ -0,0 +1,7 @@
+Template: shared/memtest86-run-lilo
+Type: boolean
+Default: false
+_Description: Run lilo automatically after upgrade (if found)?
+ If lilo is installed and its configuration file contains the
+ memtest86/memtest86+ image, then it should be re-run in order to
+ allow booting the new image.
 
=== modified file 'head.S'
--- head.S	2009-03-01 16:50:40 +0000
+++ head.S	2010-06-27 17:51:29 +0000
@@ -13,9 +13,11 @@
 
 .text
 #define __ASSEMBLY__
+#define ASM_FILE
 #include "defs.h"
 #include "config.h"
 #include "test.h"
+#include "multiboot.h"
 
 /*
  * References to members of the boot_cpu_data structure.
@@ -31,6 +33,22 @@
 #define X86_PWRCAP 40
 #define X86_EXT	44
 #define X86_FFL	48
+#define X86_DCACHE0_EAX	52
+#define X86_DCACHE0_EBX	56
+#define X86_DCACHE0_ECX	60
+#define X86_DCACHE0_EDX	64
+#define X86_DCACHE1_EAX	68
+#define X86_DCACHE1_EBX	72
+#define X86_DCACHE1_ECX	76
+#define X86_DCACHE1_EDX	80
+#define X86_DCACHE2_EAX	84
+#define X86_DCACHE2_EBX	88
+#define X86_DCACHE2_ECX	92
+#define X86_DCACHE2_EDX	96
+#define X86_DCACHE3_EAX	100
+#define X86_DCACHE3_EBX	104
+#define X86_DCACHE3_ECX	108
+#define X86_DCACHE3_EDX	112
 
 	.code32
 	.globl startup_32
@@ -38,6 +56,13 @@
 	cld
 	cli
 
+	/* Store MBI pointer */
+	xorl	%ecx, %ecx
+	cmpl	$MULTIBOOT_BOOTLOADER_MAGIC, %eax
+	jne 0f
+	movl	%ebx, %ecx
+0:
+
 	/* Ensure I have a stack pointer */
 	testl	%esp, %esp
 	jnz 0f
@@ -50,6 +75,20 @@
 0:	popl	%ebx
 	addl	$_GLOBAL_OFFSET_TABLE_+[.-0b], %ebx
 
+	/* Move MBI pointer to a safe place */
+	testl	%ecx, %ecx
+	je	0f
+	movl	%ecx, mbiptr@GOTOFF(%ebx)
+0:
+
+	jmp	0f
+	/* Multiboot header */
+.align 4
+	.long   MULTIBOOT_HEADER_MAGIC
+	.long   0
+	.long   -MULTIBOOT_HEADER_MAGIC
+0:
+
 	/* Pick the appropriate stack address */
 	leal	stack_top@GOTOFF(%ebx), %esp
 
@@ -373,6 +412,37 @@
 	movl	%ebx, X86_CACHE+4(%esi)
 	movl	%ecx, X86_CACHE+8(%esi)
 	movl	%edx, X86_CACHE+12(%esi)
+# Grab deterministic cache information (for 32nm Intel CPU)
+	cmpw $0x0000,%dx
+	jne id_done
+	movl $4, %eax
+	movl $0, %ecx
+	cpuid
+	movl	%eax, X86_DCACHE0_EAX(%esi)
+	movl	%ebx, X86_DCACHE0_EBX(%esi)
+	movl	%ecx, X86_DCACHE0_ECX(%esi)
+	movl	%edx, X86_DCACHE0_EDX(%esi)	
+	movl $4, %eax
+	movl $1, %ecx
+	cpuid
+	movl	%eax, X86_DCACHE1_EAX(%esi)
+	movl	%ebx, X86_DCACHE1_EBX(%esi)
+	movl	%ecx, X86_DCACHE1_ECX(%esi)
+	movl	%edx, X86_DCACHE1_EDX(%esi)	
+	movl $4, %eax
+	movl $2, %ecx
+	cpuid
+	movl	%eax, X86_DCACHE2_EAX(%esi)
+	movl	%ebx, X86_DCACHE2_EBX(%esi)
+	movl	%ecx, X86_DCACHE2_ECX(%esi)
+	movl	%edx, X86_DCACHE2_EDX(%esi)	
+	movl $4, %eax
+	movl $3, %ecx
+	cpuid
+	movl	%eax, X86_DCACHE3_EAX(%esi)
+	movl	%ebx, X86_DCACHE3_EBX(%esi)
+	movl	%ecx, X86_DCACHE3_ECX(%esi)
+	movl	%edx, X86_DCACHE3_EDX(%esi)	
 	jmp	id_done
 
 not_intel:
@@ -956,6 +1026,9 @@
 	movl	$1, %eax
 	ret
 
+.globl mbiptr
+mbiptr:
+	.long	0
 realptr:
 	.word	real - RSTART
 	.word	0x0000
@@ -980,6 +1053,6 @@
 .bss
 .balign 16
 stack:
-	. = . + 4096
+	. = . + 8192
 stack_top:
 .previous
 
=== modified file 'init.c'
--- init.c	2009-11-09 17:09:57 +0000
+++ init.c	2010-06-27 17:51:29 +0000
@@ -3,7 +3,7 @@
  * Released under version 2 of the Gnu Public License.
  * By Chris Brady, [e-mail]
  * ----------------------------------------------------
- * MemTest86+ V4.00 Specific code (GPL V2.0)
+ * MemTest86+ V4.10 Specific code (GPL V2.0)
  * By Samuel DEMEULEMEESTER, [e-mail]
  * http://www.canardpc.com - http://www.memtest.org
  */
@@ -15,6 +15,7 @@
 #include "pci.h"
 #include "io.h"
 #include "spd.h"
+#include "multiboot.h"
 
 #define rdmsr(msr,val1,val2) \
 	__asm__ __volatile__("rdmsr" \
@@ -65,7 +66,7 @@
 	for(i=0, pp=(char *)(SCREEN_ADR+1); i<TITLE_WIDTH; i++, pp+=2) {
 		*pp = 0x20;
 	}
-	cprint(0, 0, "      Memtest86  v4.00      ");
+	cprint(0, 0, "      Memtest86  v4.10      ");
 
 	for(i=0, pp=(char *)(SCREEN_ADR+1); i<2; i++, pp+=30) {
 		*pp = 0xA4;
@@ -98,7 +99,10 @@
 	/* Determine the memory map */
 	if ((firmware == FIRMWARE_UNKNOWN) &&
 		(memsz_mode != SZ_MODE_PROBE)) {
-		if (query_linuxbios()) {
+		if (query_multiboot()) {
+			firmware = FIRMWARE_MULTIBOOT;
+		}
+		else if (query_linuxbios()) {
 			firmware = FIRMWARE_LINUXBIOS;
 		}
 		else if (query_pcbios()) {
@@ -777,6 +781,41 @@
 					break;		
 				}
 			}
+		
+		// If no cache found, check if deterministic cache info are available
+		if(l1_cache == 0 && ((cpu_id.dcache0_eax >> 5) & 7) == 1) 
+			{
+		
+			long dcache[] = { cpu_id.dcache0_eax, cpu_id.dcache0_ebx, cpu_id.dcache0_ecx, cpu_id.dcache0_edx,
+												cpu_id.dcache1_eax, cpu_id.dcache1_ebx, cpu_id.dcache1_ecx, cpu_id.dcache1_edx,
+												cpu_id.dcache2_eax, cpu_id.dcache2_ebx, cpu_id.dcache2_ecx, cpu_id.dcache2_edx,
+												cpu_id.dcache3_eax, cpu_id.dcache3_ebx, cpu_id.dcache3_ecx, cpu_id.dcache3_edx
+											};
+			
+			for(i=0; i<4; i++)
+			{
+				switch((dcache[i*4] >> 5) & 7)
+				{
+					case 1:
+						// We don't want L1 I-Cache, only L1 D-Cache
+						if((dcache[i*4] & 3) != 2)
+						{
+							l1_cache = (((dcache[i*4+1] >> 22) & 0x3FF) + 1) * (((dcache[i*4+1] >> 12) & 0x3FF) + 1);
+							l1_cache *= ((dcache[i*4+1] & 0xFFF) + 1) * (dcache[i*4+2] + 1) / 1024;
+						}
+						break;
+					case 2:
+						l2_cache = (((dcache[i*4+1] >> 22) & 0x3FF) + 1) * (((dcache[i*4+1] >> 12) & 0x3FF) + 1);
+						l2_cache *= ((dcache[i*4+1] & 0xFFF) + 1) * (dcache[i*4+2] + 1) / 1024;
+						break;			
+					case 3:
+						l3_cache = (((dcache[i*4+1] >> 22) & 0x3FF) + 1) * (((dcache[i*4+1] >> 12) & 0x3FF) + 1);
+						l3_cache *= ((dcache[i*4+1] & 0xFFF) + 1) * (dcache[i*4+2] + 1) / 1024;
+						break;						
+				}	
+			}
+		}
+
 
 			switch(cpu_id.type) {
 			case 5:
@@ -818,7 +857,7 @@
 					if(((cpu_id.ext >> 16) & 0xF) > 1) {
 						cprint(LINE_CPU, 0, "Intel Core i3/i5");
 						tsc_invariable = 1;
-						imc_type = 0x0002;
+						imc_type = 0x0003;
 						off = 16;
 					} else {
 						cprint(LINE_CPU, 0, "Intel EP80579");
@@ -876,10 +915,16 @@
 					break;
 				case 10:
 					if (((cpu_id.ext >> 16) & 0xF) != 0) {
-						  tsc_invariable = 1;
-						  imc_type = 0x0001;
-							cprint(LINE_CPU, 0, "Intel Core i7");
-							off = 13;
+							tsc_invariable = 1;
+							if(((cpu_id.ext >> 16) & 0xF) > 1) {
+								cprint(LINE_CPU, 0, "Intel SNB");
+								imc_type = 0x0003;
+								off = 9;
+							} else {
+							  imc_type = 0x0001;
+								cprint(LINE_CPU, 0, "Intel Core i7");
+								off = 13;
+							}
 						} else {
 							cprint(LINE_CPU, 0, "Pentium III Xeon");
 							off = 16;
@@ -887,10 +932,10 @@
 					break;
 				case 12:
 					if (((cpu_id.ext >> 16) & 0xF) > 1) {					
-						cprint(LINE_CPU, 0, "Intel Core i9");
+						cprint(LINE_CPU, 0, "Core i7 (32nm)");
 						tsc_invariable = 1;
 						imc_type = 0x0002;
-						off = 13;
+						off = 14;
 					} else {
 						l1_cache = 24;
 						cprint(LINE_CPU, 0, "Atom (0.045)");
@@ -1369,7 +1414,7 @@
 				"lodsl\n\t" \
        		 		"loop L2\n\t" \
 				:: "g" (src), "g" (wlen)
-				: "esi", "ecx"
+				: "esi", "ecx", "eax"
 			);
 		}
 		asm __volatile__ ("rdtsc":"=a" (end_low),"=d" (end_high));
 
=== modified file 'lib.c'
--- lib.c	2009-09-29 23:40:15 +0000
+++ lib.c	2010-06-27 17:51:29 +0000
@@ -24,7 +24,7 @@
 #error Bad SERIAL_TTY. Only ttyS0 and ttyS1 are supported.
 #endif
 short serial_tty = SERIAL_TTY;
-const short serial_base_ports[] = {0x3f8, 0x2f8};
+const short serial_base_ports[] = {0x3f8, 0x2f8, 0x3e8, 0x2e8};
 
 #if ((115200%SERIAL_BAUD_RATE) != 0)
 #error Bad default baud rate
@@ -1053,8 +1053,8 @@
 	if (option == param)
 		return;   /* there were no digits */
 
-	if (tty > 1)
-		return;   /* only ttyS0 and ttyS1 supported */
+	if (tty > 3)
+		return;   /* only ttyS0 to ttyS3 supported */
 
 	if (*option == '\0' || *option == ' ')
 		goto save_tty; /* no options given, just ttyS? */
 
=== modified file 'main.c'
--- main.c	2009-09-29 23:40:15 +0000
+++ main.c	2010-06-27 17:51:29 +0000
@@ -11,9 +11,12 @@
 #include "test.h"
 #include "defs.h"
 #include "config.h"
+#include "multiboot.h"
 #undef TEST_TIMES
 #define DEFTESTS 9
 
+extern struct multiboot_info *mbiptr;
+
 extern void bzero();
 
 const struct tseq tseq[] = {
@@ -151,11 +154,15 @@
 	if (cmdline_parsed)
 		return;
 
-	if (*OLD_CL_MAGIC_ADDR != OLD_CL_MAGIC)
-		return;
+	if (mbiptr && (mbiptr->flags & MULTIBOOT_INFO_CMDLINE)) {
+		cmdline = (void *) mbiptr->cmdline;
+	} else {
+		if (*OLD_CL_MAGIC_ADDR != OLD_CL_MAGIC)
+			return;
 
-	unsigned short offset = *OLD_CL_OFFSET_ADDR;
-	cmdline = MK_PTR(INITSEG, offset);
+		unsigned short offset = *OLD_CL_OFFSET_ADDR;
+		cmdline = MK_PTR(INITSEG, offset);
+	}
 
 	/* skip leading spaces */
 	while (*cmdline == ' ')
 
=== modified file 'makeiso.sh'
--- makeiso.sh	2009-09-29 23:40:15 +0000
+++ makeiso.sh	2010-06-27 17:51:29 +0000
@@ -37,9 +37,9 @@
 echo -e "There is nothing to do here\r\r\nMemtest86+ is located on the bootsector of this CD\r\r\n" > README.TXT
 echo -e "Just boot from this CD and Memtest86+ will launch" >> README.TXT
 
-mkisofs -A "MKISOFS 1.1.2" -p "Memtest86+ 4.00" -publisher "Samuel D. <[e-mail]>" -b boot/memtest.img -c boot/boot.catalog -V "MT201" -o memtest.iso .
-mv memtest.iso ../mt400.iso
+mkisofs -A "MKISOFS 1.1.2" -p "Memtest86+ 4.10" -publisher "Samuel D. <[e-mail]>" -b boot/memtest.img -c boot/boot.catalog -V "MT410" -o memtest.iso .
+mv memtest.iso ../mt410.iso
 cd ..
 rm -rf cd
 
-echo "Done! Memtest86+ 4.00 ISO is mt400.iso"
+echo "Done! Memtest86+ 4.10 ISO is mt410.iso"
 
=== modified file 'memsize.c'
--- memsize.c	2009-09-29 23:40:15 +0000
+++ memsize.c	2010-06-27 17:51:29 +0000
@@ -75,7 +75,7 @@
 
 static void memsize_bios()
 {
-	if (firmware == FIRMWARE_PCBIOS) {
+	if (firmware == FIRMWARE_PCBIOS || firmware == FIRMWARE_MULTIBOOT) {
 		memsize_820();
 	}
 	else if (firmware == FIRMWARE_LINUXBIOS) {
 
=== removed file 'memtest.exe'
 Binary files memtest.exe	2009-09-29 23:40:15 +0000 and memtest.exe	1970-01-01 00:00:00 +0000 differ
=== modified file 'memtest.lds'
--- memtest.lds	2005-04-04 15:19:44 +0000
+++ memtest.lds	2010-06-27 17:51:29 +0000
@@ -3,7 +3,7 @@
 
 ENTRY(_start); 
 SECTIONS {
-	. = 0x10000;
+	. = 0x5000;
 	_start = . ;
 	.data : {
 		*(.data)
 
=== modified file 'mt86+_loader'
 Binary files mt86+_loader	2009-11-09 17:09:57 +0000 and mt86+_loader	2010-06-27 17:51:29 +0000 differ
=== modified file 'mt86+_loader.asm'
--- mt86+_loader.asm	2009-11-09 17:09:57 +0000
+++ mt86+_loader.asm	2010-06-27 17:51:29 +0000
@@ -12,8 +12,8 @@
 ; The good thing is that you get a single file which can be
 ; compressed, for example with http://upx.sf.net/ (UPX).
 
-%define fullsize (160280 + buffer - exeh)
-	; 160280 is the size of memtest86+ V4.00, adjust as needed!
+%define fullsize (165080 + buffer - exeh)
+	; 165080 is the size of memtest86+ V4.00, adjust as needed!
 
 %define stacksize 2048
 %define stackpara ((stacksize + 15) / 16)
 
=== added file 'multiboot.c'
--- multiboot.c	1970-01-01 00:00:00 +0000
+++ multiboot.c	2010-06-27 17:51:29 +0000
@@ -0,0 +1,49 @@
+/* multiboot.c
+ *
+ * Copyright (C) 2008,2009 Robert Millan
+ *
+ * Loosely based on linuxbios.c, which is:
+ *
+ * Released under version 2 of the Gnu Public License.
+ * By Eric Biederman
+ */
+
+#include "multiboot.h"
+#include "test.h"
+
+extern struct multiboot_info *mbiptr;
+
+int query_multiboot(void)
+{
+	struct multiboot_mmap_entry *mem;
+	int i;
+
+	if (!mbiptr) {
+		return 0;
+	}
+	if (!mbiptr->mmap_addr) {
+		return 1;
+	}
+	if ((mbiptr->flags & MULTIBOOT_INFO_MEM_MAP) == 0) {
+		return 1;
+	}
+
+	mem = (struct multiboot_mmap_entry *) mbiptr->mmap_addr;
+	mem_info.e820_nr = 0;
+
+	for (i = 0; i < E820MAX; i++) {
+		if ((multiboot_uint32_t) mem >= (mbiptr->mmap_addr + mbiptr->mmap_length)) {
+			break;
+		}
+
+		mem_info.e820[mem_info.e820_nr].addr = mem->addr;
+		mem_info.e820[mem_info.e820_nr].size = mem->len;
+		/* Multiboot spec defines available / reserved types to match with E820.  */
+		mem_info.e820[mem_info.e820_nr].type = mem->type;
+		mem_info.e820_nr++;
+
+		mem = (struct multiboot_mmap_entry *) ((multiboot_uint32_t) mem + mem->size + sizeof (mem->size));
+	}
+
+	return 1;
+}
 
=== added file 'multiboot.h'
--- multiboot.h	1970-01-01 00:00:00 +0000
+++ multiboot.h	2010-06-27 17:51:29 +0000
@@ -0,0 +1,259 @@
+/*  multiboot.h - Multiboot header file.  */
+/*  Copyright (C) 1999,2003,2007,2008,2009,2010  Free Software Foundation, Inc.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to
+ *  deal in the Software without restriction, including without limitation the
+ *  rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ *  sell copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL ANY
+ *  DEVELOPER OR DISTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ *  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+ *  IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef MULTIBOOT_HEADER
+#define MULTIBOOT_HEADER 1
+
+/* How many bytes from the start of the file we search for the header.  */
+#define MULTIBOOT_SEARCH			8192
+
+/* The magic field should contain this.  */
+#define MULTIBOOT_HEADER_MAGIC			0x1BADB002
+
+/* This should be in %eax.  */
+#define MULTIBOOT_BOOTLOADER_MAGIC		0x2BADB002
+
+/* Alignment of multiboot modules.  */
+#define MULTIBOOT_MOD_ALIGN			0x00001000
+
+/* Alignment of the multiboot info structure.  */
+#define MULTIBOOT_INFO_ALIGN			0x00000004
+
+/* Flags set in the 'flags' member of the multiboot header.  */
+
+/* Align all boot modules on i386 page (4KB) boundaries.  */
+#define MULTIBOOT_PAGE_ALIGN			0x00000001
+
+/* Must pass memory information to OS.  */
+#define MULTIBOOT_MEMORY_INFO			0x00000002
+
+/* Must pass video information to OS.  */
+#define MULTIBOOT_VIDEO_MODE			0x00000004
+
+/* This flag indicates the use of the address fields in the header.  */
+#define MULTIBOOT_AOUT_KLUDGE			0x00010000
+
+/* Flags to be set in the 'flags' member of the multiboot info structure.  */
+
+/* is there basic lower/upper memory information? */
+#define MULTIBOOT_INFO_MEMORY			0x00000001
+/* is there a boot device set? */
+#define MULTIBOOT_INFO_BOOTDEV			0x00000002
+/* is the command-line defined? */
+#define MULTIBOOT_INFO_CMDLINE			0x00000004
+/* are there modules to do something with? */
+#define MULTIBOOT_INFO_MODS			0x00000008
+
+/* These next two are mutually exclusive */
+
+/* is there a symbol table loaded? */
+#define MULTIBOOT_INFO_AOUT_SYMS		0x00000010
+/* is there an ELF section header table? */
+#define MULTIBOOT_INFO_ELF_SHDR			0X00000020
+
+/* is there a full memory map? */
+#define MULTIBOOT_INFO_MEM_MAP			0x00000040
+
+/* Is there drive info?  */
+#define MULTIBOOT_INFO_DRIVE_INFO		0x00000080
+
+/* Is there a config table?  */
+#define MULTIBOOT_INFO_CONFIG_TABLE		0x00000100
+
+/* Is there a boot loader name?  */
+#define MULTIBOOT_INFO_BOOT_LOADER_NAME		0x00000200
+
+/* Is there a APM table?  */
+#define MULTIBOOT_INFO_APM_TABLE		0x00000400
+
+/* Is there video information?  */
+#define MULTIBOOT_INFO_VBE_INFO		        0x00000800
+#define MULTIBOOT_INFO_FRAMEBUFFER_INFO	        0x00001000
+
+#ifndef ASM_FILE
+
+typedef unsigned char		multiboot_uint8_t;
+typedef unsigned short		multiboot_uint16_t;
+typedef unsigned int		multiboot_uint32_t;
+typedef unsigned long long	multiboot_uint64_t;
+
+struct multiboot_header
+{
+  /* Must be MULTIBOOT_MAGIC - see above.  */
+  multiboot_uint32_t magic;
+
+  /* Feature flags.  */
+  multiboot_uint32_t flags;
+
+  /* The above fields plus this one must equal 0 mod 2^32. */
+  multiboot_uint32_t checksum;
+
+  /* These are only valid if MULTIBOOT_AOUT_KLUDGE is set.  */
+  multiboot_uint32_t header_addr;
+  multiboot_uint32_t load_addr;
+  multiboot_uint32_t load_end_addr;
+  multiboot_uint32_t bss_end_addr;
+  multiboot_uint32_t entry_addr;
+
+  /* These are only valid if MULTIBOOT_VIDEO_MODE is set.  */
+  multiboot_uint32_t mode_type;
+  multiboot_uint32_t width;
+  multiboot_uint32_t height;
+  multiboot_uint32_t depth;
+};
+
+/* The symbol table for a.out.  */
+struct multiboot_aout_symbol_table
+{
+  multiboot_uint32_t tabsize;
+  multiboot_uint32_t strsize;
+  multiboot_uint32_t addr;
+  multiboot_uint32_t reserved;
+};
+typedef struct multiboot_aout_symbol_table multiboot_aout_symbol_table_t;
+
+/* The section header table for ELF.  */
+struct multiboot_elf_section_header_table
+{
+  multiboot_uint32_t num;
+  multiboot_uint32_t size;
+  multiboot_uint32_t addr;
+  multiboot_uint32_t shndx;
+};
+typedef struct multiboot_elf_section_header_table multiboot_elf_section_header_table_t;
+
+struct multiboot_color
+{
+  multiboot_uint8_t red;
+  multiboot_uint8_t green;
+  multiboot_uint8_t blue;
+};
+
+struct multiboot_info
+{
+  /* Multiboot info version number */
+  multiboot_uint32_t flags;
+
+  /* Available memory from BIOS */
+  multiboot_uint32_t mem_lower;
+  multiboot_uint32_t mem_upper;
+
+  /* "root" partition */
+  multiboot_uint32_t boot_device;
+
+  /* Kernel command line */
+  multiboot_uint32_t cmdline;
+
+  /* Boot-Module list */
+  multiboot_uint32_t mods_count;
+  multiboot_uint32_t mods_addr;
+
+  union
+  {
+    multiboot_aout_symbol_table_t aout_sym;
+    multiboot_elf_section_header_table_t elf_sec;
+  } u;
+
+  /* Memory Mapping buffer */
+  multiboot_uint32_t mmap_length;
+  multiboot_uint32_t mmap_addr;
+
+  /* Drive Info buffer */
+  multiboot_uint32_t drives_length;
+  multiboot_uint32_t drives_addr;
+
+  /* ROM configuration table */
+  multiboot_uint32_t config_table;
+
+  /* Boot Loader Name */
+  multiboot_uint32_t boot_loader_name;
+
+  /* APM table */
+  multiboot_uint32_t apm_table;
+
+  /* Video */
+  multiboot_uint32_t vbe_control_info;
+  multiboot_uint32_t vbe_mode_info;
+  multiboot_uint16_t vbe_mode;
+  multiboot_uint16_t vbe_interface_seg;
+  multiboot_uint16_t vbe_interface_off;
+  multiboot_uint16_t vbe_interface_len;
+
+  multiboot_uint64_t framebuffer_addr;
+  multiboot_uint32_t framebuffer_pitch;
+  multiboot_uint32_t framebuffer_width;
+  multiboot_uint32_t framebuffer_height;
+  multiboot_uint8_t framebuffer_bpp;
+#define MULTIBOOT_FRAMEBUFFER_TYPE_INDEXED	0
+#define MULTIBOOT_FRAMEBUFFER_TYPE_RGB		1
+#define MULTIBOOT_FRAMEBUFFER_TYPE_EGA_TEXT	2
+  multiboot_uint8_t framebuffer_type;
+  union
+  {
+    /* Indexed color.  */
+    struct
+    {
+      struct multiboot_color *framebuffer_palette_addr;
+      multiboot_uint16_t framebuffer_palette_num_colors;
+    };
+
+    /* Direct RGB color.  */
+    struct
+    {
+      multiboot_uint8_t framebuffer_red_field_position;
+      multiboot_uint8_t framebuffer_red_mask_size;
+      multiboot_uint8_t framebuffer_green_field_position;
+      multiboot_uint8_t framebuffer_green_mask_size;
+      multiboot_uint8_t framebuffer_blue_field_position;
+      multiboot_uint8_t framebuffer_blue_mask_size;
+    };
+  };
+};
+typedef struct multiboot_info multiboot_info_t;
+
+struct multiboot_mmap_entry
+{
+  multiboot_uint32_t size;
+  multiboot_uint64_t addr;
+  multiboot_uint64_t len;
+#define MULTIBOOT_MEMORY_AVAILABLE		1
+#define MULTIBOOT_MEMORY_RESERVED		2
+  multiboot_uint32_t type;
+} __attribute__((packed));
+typedef struct multiboot_mmap_entry multiboot_memory_map_t;
+
+struct multiboot_mod_list
+{
+  /* the memory used goes from bytes 'mod_start' to 'mod_end-1' inclusive */
+  multiboot_uint32_t mod_start;
+  multiboot_uint32_t mod_end;
+
+  /* Module command line */
+  multiboot_uint32_t cmdline;
+
+  /* padding to take it to 16 bytes (must be zero) */
+  multiboot_uint32_t pad;
+};
+typedef struct multiboot_mod_list multiboot_module_t;
+
+#endif /* ! ASM_FILE */
+
+#endif /* ! MULTIBOOT_HEADER */
 
=== modified file 'precomp.bin'
 Binary files precomp.bin	2009-11-09 17:09:57 +0000 and precomp.bin	2010-06-27 17:51:29 +0000 differ
=== modified file 'test.h'
--- test.h	2009-09-29 23:40:15 +0000
+++ test.h	2010-06-27 17:51:29 +0000
@@ -14,9 +14,9 @@
 #define E801    0x04
 #define E820NR  0x08           /* # entries in E820MAP */
 #define E820MAP 0x0c           /* our map */
-#define E820MAX 32             /* number of entries in E820MAP */
+#define E820MAX 64             /* number of entries in E820MAP */
 #define E820ENTRY_SIZE 20
-#define MEMINFO_SIZE 0x28c
+#define MEMINFO_SIZE (E820MAP + E820MAX * E820ENTRY_SIZE)
 #define MAX_DMI_MEMDEVS 16
 
 #ifndef __ASSEMBLY__
@@ -106,6 +106,7 @@
 void *memmove(void *dest, const void *src, ulong n);
 int query_linuxbios(void);
 int query_pcbios(void);
+int query_multiboot(void);
 int insertaddress(ulong);
 void printpatn(void);
 void printpatn(void);
@@ -269,6 +270,22 @@
 	long pwrcap;
 	long ext;
 	long feature_flag;
+	long dcache0_eax;
+	long dcache0_ebx;
+	long dcache0_ecx;
+	long dcache0_edx;
+	long dcache1_eax;
+	long dcache1_ebx;
+	long dcache1_ecx;
+	long dcache1_edx;	
+	long dcache2_eax;
+	long dcache2_ebx;
+	long dcache2_ecx;
+	long dcache2_edx;	
+	long dcache3_eax;
+	long dcache3_ebx;
+	long dcache3_ecx;
+	long dcache3_edx;
 };
 
 struct xadr {
@@ -335,6 +352,7 @@
 #define FIRMWARE_UNKNOWN   0
 #define FIRMWARE_PCBIOS    1
 #define FIRMWARE_LINUXBIOS 2
+#define FIRMWARE_MULTIBOOT 3
 
 extern struct vars * const v;
 extern unsigned char _start[], _end[], startup_32[];