diff options
author | Anthony Liguori | 2011-05-12 15:08:12 +0200 |
---|---|---|
committer | Anthony Liguori | 2011-05-12 15:08:12 +0200 |
commit | 711c21280b2cb56060859cc574221a8bf40f908a (patch) | |
tree | 9f5385c53ac50e613ae34d4165d02460ef993f0f /darwin-user/syscall.c | |
parent | Merge remote-tracking branch 'agraf/xen-next' into staging (diff) | |
parent | lsi53c895a: Rename 'sense' to 'status' (diff) | |
download | qemu-711c21280b2cb56060859cc574221a8bf40f908a.tar.gz qemu-711c21280b2cb56060859cc574221a8bf40f908a.tar.xz qemu-711c21280b2cb56060859cc574221a8bf40f908a.zip |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
Conflicts:
cpu-all.h
Diffstat (limited to 'darwin-user/syscall.c')
-rw-r--r-- | darwin-user/syscall.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/darwin-user/syscall.c b/darwin-user/syscall.c index 060acc889d..f3cc1f83a6 100644 --- a/darwin-user/syscall.c +++ b/darwin-user/syscall.c @@ -977,7 +977,7 @@ long do_unix_syscall_indirect(void *cpu_env, int num) #elif TARGET_PPC { int i; - /* XXX: not really needed those regs are volatile accross calls */ + /* XXX: not really needed those regs are volatile across calls */ uint32_t **regs = ((CPUPPCState*)cpu_env)->gpr; for(i = 11; i > 3; i--) *regs[i] = *regs[i-1]; |