diff options
| -rw-r--r-- | src/cpu/static_inst.hh | 2 | ||||
| -rw-r--r-- | src/dev/SimpleDisk.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/cpu/static_inst.hh b/src/cpu/static_inst.hh index 2e1ebd766..c02c1c3bc 100644 --- a/src/cpu/static_inst.hh +++ b/src/cpu/static_inst.hh @@ -398,8 +398,8 @@ class StaticInst : public StaticInstBase { panic("StaticInst::branchTarget() called on instruction " "that is not an indirect branch."); - } M5_DUMMY_RETURN + } /** * Return true if the instruction is a control transfer, and if so, diff --git a/src/dev/SimpleDisk.py b/src/dev/SimpleDisk.py index 1c9193035..cf28c9c19 100644 --- a/src/dev/SimpleDisk.py +++ b/src/dev/SimpleDisk.py @@ -32,4 +32,4 @@ from m5.proxy import * class SimpleDisk(SimObject): type = 'SimpleDisk' disk = Param.DiskImage("Disk Image") - system = Param.System(Parent.any, "Sysetm Pointer") + system = Param.System(Parent.any, "System Pointer") |