From: Ron Dreslinski Date: Tue, 10 Oct 2006 06:00:37 +0000 (-0400) Subject: Fix another merge issue X-Git-Tag: m5_2.0_beta2~104^2~22^2~2 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=89e80ccc203891f056a587b777fde9efddaba18f;p=gem5.git Fix another merge issue --HG-- extra : convert_revision : 2b33da5e8578ea6a8bdd2d89f183c2e6b942b0fc --- diff --git a/src/mem/packet.hh b/src/mem/packet.hh index 426f14421..3d43615bf 100644 --- a/src/mem/packet.hh +++ b/src/mem/packet.hh @@ -178,9 +178,6 @@ class Packet IsUpgrade = 1 << 9, HasData = 1 << 10 }; -//For statistics we need max number of commands, hard code it at -//20 for now. @todo fix later -#define NUM_MEM_CMDS 1 << 10 public: /** List of all commands associated with a packet. */