Merge remote-tracking branch 'stefanha/trivial-patches' into staging

This commit is contained in:
Anthony Liguori 2011-10-10 08:09:02 -05:00
commit 057643f6c4
6 changed files with 16 additions and 17 deletions

View file

@ -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);