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 /bsd-user/main.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 'bsd-user/main.c')
| -rw-r--r-- | bsd-user/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bsd-user/main.c b/bsd-user/main.c index 6b12f8bba1..0c3fca15ca 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -237,7 +237,7 @@ void cpu_loop(CPUX86State *env) break; #ifndef TARGET_ABI32 case EXCP_SYSCALL: - /* syscall from syscall intruction */ + /* syscall from syscall instruction */ if (bsd_type == target_freebsd) env->regs[R_EAX] = do_freebsd_syscall(env, env->regs[R_EAX], |