summaryrefslogtreecommitdiff
path: root/cpu/simple_cpu
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2004-06-23 17:55:54 -0400
committerAli Saidi <saidi@eecs.umich.edu>2004-06-23 17:55:54 -0400
commit17bfb1540e938406548202f3f1c941857f514c33 (patch)
tree6b39561099e011efbc9f59be4048b1cca4fa96a8 /cpu/simple_cpu
parent231fac0a2b4ed7c882c6d83c279bf2a4d2083726 (diff)
parent06d8f0af5def68e395b58636d5e7d6ca69daa51f (diff)
downloadgem5-17bfb1540e938406548202f3f1c941857f514c33.tar.xz
Merge zizzer:/bk/linux into zeep.eecs.umich.edu:/z/saidi/work/m5-endian
--HG-- extra : convert_revision : d4938c6011173d3017f47fd592c4b5e4c8d543a3
Diffstat (limited to 'cpu/simple_cpu')
-rw-r--r--cpu/simple_cpu/simple_cpu.hh2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu/simple_cpu/simple_cpu.hh b/cpu/simple_cpu/simple_cpu.hh
index 6639dbc1a..3692ab511 100644
--- a/cpu/simple_cpu/simple_cpu.hh
+++ b/cpu/simple_cpu/simple_cpu.hh
@@ -253,7 +253,7 @@ class SimpleCPU : public BaseCPU
// need to do this...
}
- void writeHint(Addr addr, int size)
+ void writeHint(Addr addr, int size, unsigned flags)
{
// need to do this...
}