* mmap/i386/pc/mmap_helper.S: Set CF on return.

diff --git a/ChangeLog b/ChangeLog
index 1d89f5cbb4a357545c359d8b78961a070b87d429..74f2b825959023ff48b35e721762035539b9f0d2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-28  Josh Triplett  <josh@joshtriplett.org>
+
+       * mmap/i386/pc/mmap_helper.S: Set CF on return.
+
 2010-06-28  Colin Watson  <cjwatson@ubuntu.com>
 
        * util/grub-install.in: Add --debug-image= option.

diff --git a/mmap/i386/pc/mmap_helper.S b/mmap/i386/pc/mmap_helper.S
index 7439545741f8dffef8b2ffe69410214039cf0ff6..3302a9a151deed0ab58fa56e949e155cca388eea 100644 (file)
--- a/mmap/i386/pc/mmap_helper.S
+++ b/mmap/i386/pc/mmap_helper.S
@@ -59,7 +59,7 @@ LOCAL (e801):
        movw %bx, %dx
        pop %ds
        clc
-       iret
+       jmp LOCAL (iret_cf)
 
 LOCAL (h88):
        popf
@@ -69,7 +69,7 @@ LOCAL (h88):
        movw DS (LOCAL (kbin16mb)), %ax
        pop %ds
        clc
-       iret
+       jmp LOCAL (iret_cf)
 
 LOCAL (e820):
        popf
@@ -101,12 +101,18 @@ LOCAL (noclean):
        mov $0x534d4150, %eax
        pop %ds
        clc
-       iret
+       jmp LOCAL (iret_cf)
 LOCAL (errexit):
        mov $0x534d4150, %eax
        pop %ds
-       stc
        xor %bx, %bx
+       stc
+
+LOCAL (iret_cf):
+       push %bp
+       mov %sp, %bp
+       setc 6(%bp)
+       pop %bp
        iret
 
 VARIABLE(grub_machine_mmaphook_mmap_num)