From b273e0be33049fc36b386b5ba183f69de53268c2 Mon Sep 17 00:00:00 2001
From: Gabe Black <gblack@eecs.umich.edu>
Date: Sun, 10 Oct 2010 20:39:26 -0700
Subject: [PATCH] X86: Detect attempts to load a 32 bit kernel and panic.

---
 src/arch/x86/system.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/arch/x86/system.cc b/src/arch/x86/system.cc
index f12d6e424..ae47b14fd 100644
--- a/src/arch/x86/system.cc
+++ b/src/arch/x86/system.cc
@@ -60,7 +60,10 @@ X86System::X86System(Params *p) :
     mpFloatingPointer(p->intel_mp_pointer),
     mpConfigTable(p->intel_mp_table),
     rsdp(p->acpi_description_table_pointer)
-{}
+{
+    if (kernel->getArch() == ObjectFile::I386)
+        fatal("Loading a 32 bit x86 kernel is not supported.\n");
+}
 
 static void
 installSegDesc(ThreadContext *tc, SegmentRegIndex seg,
-- 
2.30.2