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
/
include
/
asm
/
processor.h
diff --git
a/arch/x86/include/asm/processor.h
b/arch/x86/include/asm/processor.h
index f302ef6bb200fe01635acd700f174364daa263d5..7284c9a6a0b531c29132a475b0429046787de742 100644
(file)
--- a/
arch/x86/include/asm/processor.h
+++ b/
arch/x86/include/asm/processor.h
@@
-463,7
+463,7
@@
struct thread_struct {
unsigned long ptrace_dr7;
/* Fault info: */
unsigned long cr2;
- unsigned long trap_n
o
;
+ unsigned long trap_n
r
;
unsigned long error_code;
/* floating point and extended processor state */
struct fpu fpu;