From: Lionel Sambuc <lionel@minix3.org>
Date: Mon, 10 Mar 2014 20:28:36 +0000 (+0100)
Subject: Move Assert to check MAGIC before actual use of the MBI record
X-Git-Tag: v3.3.0~400
X-Git-Url: http://zhaoyanbai.com/repos/migration?a=commitdiff_plain;h=0472cd6e9d761cc2767f62156666e7ba030d0e3d;p=minix.git

Move Assert to check MAGIC before actual use of the MBI record
---

diff --git a/kernel/arch/i386/pre_init.c b/kernel/arch/i386/pre_init.c
index 5f50d29e9..21822b526 100644
--- a/kernel/arch/i386/pre_init.c
+++ b/kernel/arch/i386/pre_init.c
@@ -224,13 +224,13 @@ void get_parameters(u32_t ebx, kinfo_t *cbi)
 
 kinfo_t *pre_init(u32_t magic, u32_t ebx)
 {
+	assert(magic == MULTIBOOT_INFO_MAGIC);
+
 	/* Get our own copy boot params pointed to by ebx.
 	 * Here we find out whether we should do serial output.
 	 */
 	get_parameters(ebx, &kinfo);
 
-	assert(magic == MULTIBOOT_INFO_MAGIC);
-
 	/* Make and load a pagetable that will map the kernel
 	 * to where it should be; but first a 1:1 mapping so
 	 * this code stays where it should be.