From dec53e635c422f68b2e6b0d532b64f4317f211f9 Mon Sep 17 00:00:00 2001
From: Josh Triplett <josh@joshtriplett.org>
Date: Mon, 28 Jun 2010 10:17:57 +0200
Subject: [PATCH] 	* mmap/i386/pc/mmap_helper.S: Set CF on return.

---
 ChangeLog                  |  4 ++++
 mmap/i386/pc/mmap_helper.S | 14 ++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1d89f5cbb..74f2b8259 100644
--- 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 743954574..3302a9a15 100644
--- 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)