From: Andreas Hansson <andreas.hansson@arm.com>
Date: Mon, 15 Oct 2012 16:51:21 +0000 (-0400)
Subject: Mem: Fix incorrect logic in bus blocksize check
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b6bd4f34b4a20ac158af610b71aaa24ac86b1ef6;p=gem5.git

Mem: Fix incorrect logic in bus blocksize check

This patch fixes the logic in the blocksize check such that the
warning is printed if the size is not 16, 32, 64 or 128.
---

diff --git a/src/mem/bus.cc b/src/mem/bus.cc
index 274b8c258..a0db6e52a 100644
--- a/src/mem/bus.cc
+++ b/src/mem/bus.cc
@@ -100,8 +100,8 @@ BaseBus::init()
         blockSize = peer_block_size;
 
     // check if the block size is a value known to work
-    if (blockSize != 16 || blockSize != 32 || blockSize != 64 ||
-        blockSize != 128)
+    if (!(blockSize == 16 || blockSize == 32 || blockSize == 64 ||
+          blockSize == 128))
         warn_once("Block size is neither 16, 32, 64 or 128 bytes.\n");
 }