Merge ARM into the head. ARM will compile but may not actually work.

1 files changed, 13 insertions, 1 deletions

diff --git a/src/arch/x86/system.hh b/src/arch/x86/system.hh
index 8a5483ebf..12a471f6f 100644
--- a/src/arch/x86/system.hh
+++ b/src/arch/x86/system.hh
@@ -74,6 +74,11 @@ namespace X86ISA
     {
         class SMBiosTable;
     }
+    namespace IntelMP
+    {
+        class FloatingPointer;
+        class ConfigTable;
+    }
 }
 
 class X86System : public System
@@ -95,8 +100,15 @@ class X86System : public System
   protected:
 
     X86ISA::SMBios::SMBiosTable * smbiosTable;
+    X86ISA::IntelMP::FloatingPointer * mpFloatingPointer;
+    X86ISA::IntelMP::ConfigTable * mpConfigTable;
+    X86ISA::ACPI::RSDP * rsdp;
+
+    void writeOutSMBiosTable(Addr header,
+            Addr &headerSize, Addr &tableSize, Addr table = 0);
 
-    void writeOutSMBiosTable(Addr header, Addr table = 0);
+    void writeOutMPTable(Addr fp,
+            Addr &fpSize, Addr &tableSize, Addr table = 0);
 
     const Params *params() const { return (const Params *)_params; }