git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus' into stackprotector
[safe/jmp/linux-2.6]
/
arch
/
x86
/
include
/
asm
/
prctl.h
diff --git
a/arch/x86/include/asm/prctl.h
b/arch/x86/include/asm/prctl.h
index
e7ae34e
..
a889464
100644
(file)
--- a/
arch/x86/include/asm/prctl.h
+++ b/
arch/x86/include/asm/prctl.h
@@
-1,10
+1,13
@@
-#ifndef
ASM_X86_
_PRCTL_H
-#define
ASM_X86_
_PRCTL_H
+#ifndef
_ASM_X86
_PRCTL_H
+#define
_ASM_X86
_PRCTL_H
#define ARCH_SET_GS 0x1001
#define ARCH_SET_FS 0x1002
#define ARCH_GET_FS 0x1003
#define ARCH_GET_GS 0x1004
#define ARCH_SET_GS 0x1001
#define ARCH_SET_FS 0x1002
#define ARCH_GET_FS 0x1003
#define ARCH_GET_GS 0x1004
+#ifdef CONFIG_X86_64
+extern long sys_arch_prctl(int, unsigned long);
+#endif /* CONFIG_X86_64 */
-#endif /*
ASM_X86_
_PRCTL_H */
+#endif /*
_ASM_X86
_PRCTL_H */