projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-block.git]
/
arch
/
x86
/
kernel
/
vm86_32.c
diff --git
a/arch/x86/kernel/vm86_32.c
b/arch/x86/kernel/vm86_32.c
index 328cb37bb827915ccc3e87cc6518acd7ccf25686..255f58ae71e8991838080eac595786a60f372a62 100644
(file)
--- a/
arch/x86/kernel/vm86_32.c
+++ b/
arch/x86/kernel/vm86_32.c
@@
-569,7
+569,7
@@
int handle_vm86_trap(struct kernel_vm86_regs *regs, long error_code, int trapno)
}
if (trapno != 1)
return 1; /* we let this handle by the calling routine */
- current->thread.trap_n
o
= trapno;
+ current->thread.trap_n
r
= trapno;
current->thread.error_code = error_code;
force_sig(SIGTRAP, current);
return 0;