Merge branch 'linux-2.6' into for-2.6.24

3 files changed, 40 insertions, 15 deletions

diff --git a/arch/i386/boot/header.S b/arch/i386/boot/header.S
index 7f4a2c53bd76..f3140e596d40 100644
--- a/arch/i386/boot/header.S
+++ b/arch/i386/boot/header.S
@@ -275,7 +275,7 @@ die:
         hlt
         jmp     die
 
-        .size   die, .-due
+        .size   die, .-die
 
         .section ".initdata", "a"
 setup_corrupt:
diff --git a/arch/i386/boot/memory.c b/arch/i386/boot/memory.c
index 1a2e62db8bed..378353956b5d 100644
--- a/arch/i386/boot/memory.c
+++ b/arch/i386/boot/memory.c
@@ -20,6 +20,7 @@
 
 static int detect_memory_e820(void)
 {
+        int count = 0;
         u32 next = 0;
         u32 size, id;
         u8 err;
@@ -27,20 +28,33 @@ static int detect_memory_e820(void)
 
         do {
                 size = sizeof(struct e820entry);
-                id = SMAP;
+
+                /* Important: %edx is clobbered by some BIOSes,
+                   so it must be either used for the error output
+                   or explicitly marked clobbered. */
                 asm("int $0x15; setc %0"
-                    : "=am" (err), "+b" (next), "+d" (id), "+c" (size),
+                    : "=d" (err), "+b" (next), "=a" (id), "+c" (size),
                       "=m" (*desc)
-                    : "D" (desc), "a" (0xe820));
+                    : "D" (desc), "d" (SMAP), "a" (0xe820));
+
+                /* Some BIOSes stop returning SMAP in the middle of
+                   the search loop.  We don't know exactly how the BIOS
+                   screwed up the map at that point, we might have a
+                   partial map, the full map, or complete garbage, so
+                   just return failure. */
+                if (id != SMAP) {
+                        count = 0;
+                        break;
+                }
 
-                if (err || id != SMAP)
+                if (err)
                         break;
 
-                boot_params.e820_entries++;
+                count++;
                 desc++;
-        } while (next && boot_params.e820_entries < E820MAX);
+        } while (next && count < E820MAX);
 
-        return boot_params.e820_entries;
+        return boot_params.e820_entries = count;
 }
 
 static int detect_memory_e801(void)
@@ -89,11 +103,16 @@ static int detect_memory_88(void)
 
 int detect_memory(void)
 {
+        int err = -1;
+
         if (detect_memory_e820() > 0)
-                return 0;
+                err = 0;
 
         if (!detect_memory_e801())
-                return 0;
+                err = 0;
+
+        if (!detect_memory_88())
+                err = 0;
 
-        return detect_memory_88();
+        return err;
 }
diff --git a/arch/i386/boot/video.c b/arch/i386/boot/video.c
index 693f20d3102e..e4ba897bf9a3 100644
--- a/arch/i386/boot/video.c
+++ b/arch/i386/boot/video.c
@@ -147,7 +147,7 @@ int mode_defined(u16 mode)
 }
 
 /* Set mode (without recalc) */
-static int raw_set_mode(u16 mode)
+static int raw_set_mode(u16 mode, u16 *real_mode)
 {
         int nmode, i;
         struct card_info *card;
@@ -165,8 +165,10 @@ static int raw_set_mode(u16 mode)
 
                         if ((mode == nmode && visible) ||
                             mode == mi->mode ||
-                            mode == (mi->y << 8)+mi->x)
+                            mode == (mi->y << 8)+mi->x) {
+                                *real_mode = mi->mode;
                                 return card->set_mode(mi);
+                        }
 
                         if (visible)
                                 nmode++;
@@ -178,7 +180,7 @@ static int raw_set_mode(u16 mode)
                 if (mode >= card->xmode_first &&
                     mode < card->xmode_first+card->xmode_n) {
                         struct mode_info mix;
-                        mix.mode = mode;
+                        *real_mode = mix.mode = mode;
                         mix.x = mix.y = 0;
                         return card->set_mode(&mix);
                 }
@@ -223,6 +225,7 @@ static void vga_recalc_vertical(void)
 static int set_mode(u16 mode)
 {
         int rv;
+        u16 real_mode;
 
         /* Very special mode numbers... */
         if (mode == VIDEO_CURRENT_MODE)
@@ -232,13 +235,16 @@ static int set_mode(u16 mode)
         else if (mode == EXTENDED_VGA)
                 mode = VIDEO_8POINT;
 
-        rv = raw_set_mode(mode);
+        rv = raw_set_mode(mode, &real_mode);
         if (rv)
                 return rv;
 
         if (mode & VIDEO_RECALC)
                 vga_recalc_vertical();
 
+        /* Save the canonical mode number for the kernel, not
+           an alias, size specification or menu position */
+        boot_params.hdr.vid_mode = real_mode;
         return 0;
 }