git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86/pebs' into x86-v28-for-linus-phase1
[pandora-kernel.git]
/
include
/
asm-x86
/
ptrace.h
diff --git
a/include/asm-x86/ptrace.h
b/include/asm-x86/ptrace.h
index
5e0c48d
..
45c7523
100644
(file)
--- a/
include/asm-x86/ptrace.h
+++ b/
include/asm-x86/ptrace.h
@@
-1,5
+1,5
@@
-#ifndef
_ASM_X86
_PTRACE_H
-#define
_ASM_X86
_PTRACE_H
+#ifndef
ASM_X86_
_PTRACE_H
+#define
ASM_X86_
_PTRACE_H
#include <linux/compiler.h> /* For __user */
#include <asm/ptrace-abi.h>
@@
-273,4
+273,4
@@
extern int do_set_thread_area(struct task_struct *p, int idx,
#endif /* !__ASSEMBLY__ */
-#endif
+#endif
/* ASM_X86__PTRACE_H */