diff options
author | Steve Reinhardt <stever@eecs.umich.edu> | 2004-02-26 07:08:45 -0800 |
---|---|---|
committer | Steve Reinhardt <stever@eecs.umich.edu> | 2004-02-26 07:08:45 -0800 |
commit | 40c350fcfe43ad003b90e52388063c5a0c79dc20 (patch) | |
tree | 6ef096f17369ecbdcc314ae0c558ebc253af6cd6 /cpu | |
parent | f8ad539aa5c917bb10d5aeea470353700fb2b9f3 (diff) | |
parent | 6f5e104fc5683ace0c17ddb402bf8d40330f60aa (diff) | |
download | gem5-40c350fcfe43ad003b90e52388063c5a0c79dc20.tar.xz |
Merge.
--HG--
extra : convert_revision : e83f6895bceb0ced656e90275ec1a93d0af5498d
Diffstat (limited to 'cpu')
-rw-r--r-- | cpu/simple_cpu/simple_cpu.hh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cpu/simple_cpu/simple_cpu.hh b/cpu/simple_cpu/simple_cpu.hh index 4a9872e75..2b881509c 100644 --- a/cpu/simple_cpu/simple_cpu.hh +++ b/cpu/simple_cpu/simple_cpu.hh @@ -237,10 +237,9 @@ class SimpleCPU : public BaseCPU Fault write(T data, Addr addr, unsigned flags, uint64_t *res); - Fault prefetch(Addr addr, unsigned flags) + void prefetch(Addr addr, unsigned flags) { // need to do this... - return No_Fault; } void writeHint(Addr addr, int size) |