diff options
| author | Justin M. Forbes <jforbes@redhat.com> | 2012-04-02 15:44:23 -0500 |
|---|---|---|
| committer | Justin M. Forbes <jforbes@redhat.com> | 2012-04-02 15:44:23 -0500 |
| commit | d8c9baa9103001162859031f9cb6a39eb39f9695 (patch) | |
| tree | 19b3a83ed0fa487f62cd4ed6b1ac191cf799cfc3 /linux-2.6-i386-nx-emulation.patch | |
| parent | 5e9e2f5b1611a0b2acd741e8dd9fb4bbf90106e2 (diff) | |
| download | kernel-d8c9baa9103001162859031f9cb6a39eb39f9695.tar.gz kernel-d8c9baa9103001162859031f9cb6a39eb39f9695.tar.xz kernel-d8c9baa9103001162859031f9cb6a39eb39f9695.zip | |
linux 3.4-rc1
Diffstat (limited to 'linux-2.6-i386-nx-emulation.patch')
| -rw-r--r-- | linux-2.6-i386-nx-emulation.patch | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/linux-2.6-i386-nx-emulation.patch b/linux-2.6-i386-nx-emulation.patch index 565d616e1..8a7fe7a47 100644 --- a/linux-2.6-i386-nx-emulation.patch +++ b/linux-2.6-i386-nx-emulation.patch @@ -333,9 +333,9 @@ index 4d42300..4cb14a1 100644 +#endif /*CONFIG_X86_32*/ + tsk->thread.error_code = error_code; - tsk->thread.trap_no = 13; + tsk->thread.trap_nr = X86_TRAP_GP; -@@ -650,19 +745,37 @@ do_device_not_available(struct pt_regs *regs, long error_code) +@@ -650,20 +745,37 @@ do_device_not_available(struct pt_regs *regs, long error_code) } #ifdef CONFIG_X86_32 @@ -362,10 +362,11 @@ index 4d42300..4cb14a1 100644 - info.si_errno = 0; - info.si_code = ILL_BADSTK; - info.si_addr = NULL; -- if (notify_die(DIE_TRAP, "iret exception", -- regs, error_code, 32, SIGILL) == NOTIFY_STOP) +- if (notify_die(DIE_TRAP, "iret exception", regs, error_code, +- X86_TRAP_IRET, SIGILL) == NOTIFY_STOP) - return; -- do_trap(32, SIGILL, "iret exception", regs, error_code, &info); +- do_trap(X86_TRAP_IRET, SIGILL, "iret exception", regs, error_code, +- &info); + cpu = get_cpu(); + ok = check_lazy_exec_limit(cpu, regs, error_code); + put_cpu(); |