Merge zizzer:/bk/m5

into  zeep.eecs.umich.edu:/z/saidi/work/m5

--HG--
extra : convert_revision : 3eff9b41fbf30ae0365adf05a71625c92ce1a4c0

base/mysql.hh

@@ -33,6 +33,7 @@
 
 #include <cassert>
 #include <iosfwd>
+#include <mysql_version.h>
 #include <mysql.h>
 #include <string>
 #include <sstream>
@@ -89,6 +90,8 @@ class Result
     {
         if (result)
             refcount = new int(1);
+        else
+            refcount = NULL;
     }
 
     Result(const Result &result)

base/pollevent.hh

@@ -34,6 +34,7 @@
 #include "sim/root.hh"
 
 class Checkpoint;
+class PollQueue;
 
 class PollEvent
 {

dev/ethertap.hh

@@ -42,6 +42,9 @@
 #include "base/pollevent.hh"
 #include "sim/sim_object.hh"
 
+class TapEvent;
+class TapListener;
+
 /*
  * Interface to connect a simulated ethernet device to the real world
  */

dev/pciconfigall.hh

@@ -43,6 +43,7 @@ static const uint32_t MAX_PCI_DEV = 32;
 static const uint32_t MAX_PCI_FUNC = 8;
 
 class PciDev;
+class MemoryController;
 
 /**
  * PCI Config Space

dev/tsunami_cchip.hh

@@ -37,6 +37,8 @@
 #include "base/range.hh"
 #include "dev/io_device.hh"
 
+class MemoryController;
+
 /**
  * Tsunami CChip CSR Emulation. This device includes all the interrupt
  * handling code for the chipset.

dev/tsunami_io.hh

@@ -38,6 +38,8 @@
 #include "dev/tsunami.hh"
 #include "sim/eventq.hh"
 
+class MemoryController;
+
 /**
  * Tsunami I/O device is a catch all for all the south bridge stuff we care
  * to implement.

dev/tsunami_pchip.hh

@@ -37,6 +37,8 @@
 #include "base/range.hh"
 #include "dev/io_device.hh"
 
+class MemoryController;
+
 /**
  * A very simple implementation of the Tsunami PCI interface chips.
  */

sim/param.cc

@@ -303,8 +303,8 @@ template void Param<type>::parse(const string &);			\
 template void VectorParam<type>::parse(const string &);			\
 template void Param<type>::showValue(ostream &) const;			\
 template void VectorParam<type>::showValue(ostream &) const;		\
-void Param<type>::showType(ostream &os) const { os << typestr; }	\
-void VectorParam<type>::showType(ostream &os) const {			\
+template <> void Param<type>::showType(ostream &os) const { os << typestr; }	\
+template <> void VectorParam<type>::showType(ostream &os) const {			\
     os << "vector of " << typestr;					\
 }
 #endif