From ac575a9d8242d4ff8e40ac25f2fd5862ef551ad7 Mon Sep 17 00:00:00 2001
From: Ali Saidi <Ali.Saidi@ARM.com>
Date: Mon, 23 Aug 2010 11:18:39 -0500
Subject: Compiler: Fixes for GCC 4.5.

---
 src/arch/arm/table_walker.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/arch')

diff --git a/src/arch/arm/table_walker.cc b/src/arch/arm/table_walker.cc
index 937d51b87..9bf067b81 100644
--- a/src/arch/arm/table_walker.cc
+++ b/src/arch/arm/table_walker.cc
@@ -51,7 +51,7 @@ TableWalker::TableWalker(const Params *p)
     : MemObject(p), stateQueue(NUM_WALKERS), port(NULL), tlb(NULL),
       currState(NULL), doL1DescEvent(this), doL2DescEvent(this)
 {
-    sctlr = NULL;
+    sctlr = 0;
 }
 
 TableWalker::~TableWalker()
@@ -419,7 +419,7 @@ TableWalker::doL1Descriptor()
                 new PrefetchAbort(currState->vaddr, ArmFault::Translation0);
         else
             currState->fault =
-                new DataAbort(currState->vaddr, NULL, currState->isWrite,
+                new DataAbort(currState->vaddr, 0, currState->isWrite,
                                   ArmFault::Translation0);
         return;
       case L1Descriptor::Section:
@@ -532,7 +532,7 @@ TableWalker::doL2Descriptor()
           */
 
         currState->fault =
-            new DataAbort(currState->vaddr, NULL, currState->isWrite,
+            new DataAbort(currState->vaddr, 0, currState->isWrite,
                           ArmFault::AccessFlag1);
 
     }
-- 
cgit v1.2.3