diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-10 08:09:02 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-10-10 08:09:02 -0500 |
| commit | 057643f6c4751651ab640edb9b445cb3816edffc (patch) | |
| tree | 31ba8fd4a0a24d08474ba568a0fd0cfe34a3644e /target-arm | |
| parent | 9f047b8948f43dddb0ee2a391939999fab13eaf4 (diff) | |
| parent | ca8a277ccc911ce8501b1bc984a09f988379d8c3 (diff) | |
| download | qemu-057643f6c4751651ab640edb9b445cb3816edffc.zip qemu-057643f6c4751651ab640edb9b445cb3816edffc.tar.gz qemu-057643f6c4751651ab640edb9b445cb3816edffc.tar.bz2 | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
Diffstat (limited to 'target-arm')
| -rw-r--r-- | target-arm/helper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target-arm/helper.c b/target-arm/helper.c index d3a3ba2..e2428eb 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -298,7 +298,7 @@ void cpu_reset(CPUARMState *env) if (rom) { /* We should really use ldl_phys here, in case the guest modified flash and reset itself. However images - loaded via -kenrel have not been copied yet, so load the + loaded via -kernel have not been copied yet, so load the values directly from there. */ env->regs[13] = ldl_p(rom); pc = ldl_p(rom + 4); |