From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Sun, 13 Dec 2009 17:32:06 +0000 (+0100)
Subject: 2009-12-13  Vladimir Serbinenko  <phcoder@gmail.com>
X-Git-Tag: 1.98~315
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=29eb90c62056ac90fd38e82bf2da1ae388eef98c;p=thirdparty%2Fgrub.git

2009-12-13  Vladimir Serbinenko  <phcoder@gmail.com>

	* kern/i386/pc/startup.S (multiboot_entry): Setup stack before calling
	anything.
---

diff --git a/ChangeLog b/ChangeLog
index 548864ee8..5587f95f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* kern/i386/pc/startup.S (multiboot_entry): Setup stack before calling
+	anything.
+
 2009-12-13  Carles Pina i Estany  <carles@pina.cat>
 
 	* script/execute.c (grub_script_execute_cmdline): Set grub_errno to
diff --git a/kern/i386/pc/startup.S b/kern/i386/pc/startup.S
index 87365c0ed..4de14a3d1 100644
--- a/kern/i386/pc/startup.S
+++ b/kern/i386/pc/startup.S
@@ -146,6 +146,9 @@ multiboot_entry:
 	/* obtain the boot device */
 	movl	12(%ebx), %edx
 
+	movl	$GRUB_MEMORY_MACHINE_PROT_STACK, %ebp
+	movl	%ebp, %esp
+
 	/* relocate the code */
 	movl	$(GRUB_KERNEL_MACHINE_RAW_SIZE + 0x200), %ecx
 	addl	EXT_C(grub_compressed_size) - _start + 0x100000 + 0x200, %ecx