diff options
author | Ali Saidi <saidi@eecs.umich.edu> | 2007-01-26 18:50:28 -0500 |
---|---|---|
committer | Ali Saidi <saidi@eecs.umich.edu> | 2007-01-26 18:50:28 -0500 |
commit | 6d9d0c68b574ceba53fc36d34b83f7109e00b1d0 (patch) | |
tree | 8004fcb5879cd81d738bd750441fbc900208e049 /src/dev/io_device.hh | |
parent | c215d54aac6925cf13079d8d8fe3691451a77ce1 (diff) | |
parent | fd8a4ff5a8a9ea65e227f0b4000dfcda06d4764f (diff) | |
download | gem5-6d9d0c68b574ceba53fc36d34b83f7109e00b1d0.tar.xz |
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.suncc
--HG--
extra : convert_revision : 1706f6218abec7eb575dcff3ad4aef83894f64ab
Diffstat (limited to 'src/dev/io_device.hh')
-rw-r--r-- | src/dev/io_device.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dev/io_device.hh b/src/dev/io_device.hh index aa242d170..c56eba267 100644 --- a/src/dev/io_device.hh +++ b/src/dev/io_device.hh @@ -109,7 +109,7 @@ class DmaPort : public Port virtual bool recvTiming(PacketPtr pkt); virtual Tick recvAtomic(PacketPtr pkt) - { panic("dma port shouldn't be used for pio access."); } + { panic("dma port shouldn't be used for pio access."); M5_DUMMY_RETURN } virtual void recvFunctional(PacketPtr pkt) { panic("dma port shouldn't be used for pio access."); } |