diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
| commit | 905ec87e93bc9e01b15c60035cd6a50c636cbaef (patch) | |
| tree | 46fd7618d6511611ffc19eb0dd4d7bc6b90a41c2 /arch/i386/kernel/entry.S | |
| parent | 1d6ae775d7a948c9575658eb41184fd2e506c0df (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/i386/kernel/entry.S')
| -rw-r--r-- | arch/i386/kernel/entry.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/kernel/entry.S b/arch/i386/kernel/entry.S index 3aad03839660..9e24f7b207ee 100644 --- a/arch/i386/kernel/entry.S +++ b/arch/i386/kernel/entry.S | |||
| @@ -319,7 +319,7 @@ work_notifysig: # deal with pending signals and | |||
| 319 | # vm86-space | 319 | # vm86-space |
| 320 | xorl %edx, %edx | 320 | xorl %edx, %edx |
| 321 | call do_notify_resume | 321 | call do_notify_resume |
| 322 | jmp restore_all | 322 | jmp resume_userspace |
| 323 | 323 | ||
| 324 | ALIGN | 324 | ALIGN |
| 325 | work_notifysig_v86: | 325 | work_notifysig_v86: |
| @@ -329,7 +329,7 @@ work_notifysig_v86: | |||
| 329 | movl %eax, %esp | 329 | movl %eax, %esp |
| 330 | xorl %edx, %edx | 330 | xorl %edx, %edx |
| 331 | call do_notify_resume | 331 | call do_notify_resume |
| 332 | jmp restore_all | 332 | jmp resume_userspace |
| 333 | 333 | ||
| 334 | # perform syscall exit tracing | 334 | # perform syscall exit tracing |
| 335 | ALIGN | 335 | ALIGN |