Commit c9087c2a6068b23207517f7d7ff796e68290358b
1 parent
14ae3ba7
cr2 update (dosemu VGA support fix)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@191 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
2 additions
and
2 deletions
linux-user/signal.c
| @@ -175,7 +175,7 @@ void signal_init(void) | @@ -175,7 +175,7 @@ void signal_init(void) | ||
| 175 | act.sa_flags = SA_SIGINFO; | 175 | act.sa_flags = SA_SIGINFO; |
| 176 | act.sa_sigaction = host_signal_handler; | 176 | act.sa_sigaction = host_signal_handler; |
| 177 | for(i = 1; i < NSIG; i++) { | 177 | for(i = 1; i < NSIG; i++) { |
| 178 | - sigaction(i, &act, NULL); | 178 | + sigaction(i, &act, NULL); |
| 179 | } | 179 | } |
| 180 | 180 | ||
| 181 | memset(sigact_table, 0, sizeof(sigact_table)); | 181 | memset(sigact_table, 0, sizeof(sigact_table)); |
| @@ -547,7 +547,7 @@ setup_sigcontext(struct target_sigcontext *sc, struct target_fpstate *fpstate, | @@ -547,7 +547,7 @@ setup_sigcontext(struct target_sigcontext *sc, struct target_fpstate *fpstate, | ||
| 547 | #endif | 547 | #endif |
| 548 | /* non-iBCS2 extensions.. */ | 548 | /* non-iBCS2 extensions.. */ |
| 549 | err |= __put_user(mask, &sc->oldmask); | 549 | err |= __put_user(mask, &sc->oldmask); |
| 550 | - err |= __put_user(/*current->thread.cr2*/ 0, &sc->cr2); | 550 | + err |= __put_user(env->cr2, &sc->cr2); |
| 551 | return err; | 551 | return err; |
| 552 | } | 552 | } |
| 553 | 553 |