summaryrefslogtreecommitdiffstats
path: root/linux-user/signal.c
diff options
context:
space:
mode:
authorAnthony Liguori2011-05-12 15:08:12 +0200
committerAnthony Liguori2011-05-12 15:08:12 +0200
commit711c21280b2cb56060859cc574221a8bf40f908a (patch)
tree9f5385c53ac50e613ae34d4165d02460ef993f0f /linux-user/signal.c
parentMerge remote-tracking branch 'agraf/xen-next' into staging (diff)
parentlsi53c895a: Rename 'sense' to 'status' (diff)
downloadqemu-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 'linux-user/signal.c')
-rw-r--r--linux-user/signal.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-user/signal.c b/linux-user/signal.c
index ce033e90b4..6fe086b4cd 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -391,7 +391,7 @@ static void QEMU_NORETURN force_sig(int target_sig)
target_sig, strsignal(host_sig), "core dumped" );
}
- /* The proper exit code for dieing from an uncaught signal is
+ /* The proper exit code for dying from an uncaught signal is
* -<signal>. The kernel doesn't allow exit() or _exit() to pass
* a negative value. To get the proper exit code we need to
* actually die from an uncaught signal. Here the default signal