diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2010-07-16 08:01:16 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-07-16 08:01:16 -0500 |
| commit | 08218b3527301760393b0b4ec732fcdfb7ff6cda (patch) | |
| tree | 9e459205b70043b5f551ff873c4150d2f9c6584d | |
| parent | c84995c50b850ab4febc9f21c58a18ee712e7bed (diff) | |
| parent | 187b4e08d37c5e6359c0537f79a04fffbc7357bd (diff) | |
| download | qemu-08218b3527301760393b0b4ec732fcdfb7ff6cda.zip qemu-08218b3527301760393b0b4ec732fcdfb7ff6cda.tar.gz qemu-08218b3527301760393b0b4ec732fcdfb7ff6cda.tar.bz2 | |
Merge remote branch 'origin/master' into staging
| -rw-r--r-- | linux-user/signal.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux-user/signal.c b/linux-user/signal.c index e5a187e..cc0cb10 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -3213,7 +3213,8 @@ static void setup_frame(int sig, struct target_sigaction *ka, env->regs[1] = (unsigned long) frame; /* Signal handler args: */ env->regs[5] = sig; /* Arg 0: signum */ - env->regs[6] = (unsigned long) &frame->sc; /* arg 1: sigcontext */ + env->regs[6] = 0; + env->regs[7] = (unsigned long) &frame->sc; /* arg 1: sigcontext */ /* Offset of 4 to handle microblaze rtid r14, 0 */ env->sregs[SR_PC] = (unsigned long)ka->_sa_handler; |