namespaces: move the IPC namespace under IPC_NS option

[safe/jmp/linux-2.6] / include / linux / elf.h

diff --git a/include/linux/elf.h b/include/linux/elf.h
index 0eb9ed2..bad1b16 100644 (file)
--- a/include/linux/elf.h
+++ b/include/linux/elf.h
@@ -2,9 +2,10 @@
 #define _LINUX_ELF_H
 
 #include <linux/types.h>
-#include <linux/auxvec.h>
 #include <linux/elf-em.h>
+#ifdef __KERNEL__
 #include <asm/elf.h>
+#endif
 
 struct file;
 
@@ -356,6 +357,8 @@ typedef struct elf64_shdr {
 #define NT_AUXV                6
 #define NT_PRXFPREG     0x46e62b7f      /* copied from gdb5.1/include/elf/common.h */
 #define NT_PPC_VMX     0x100           /* PowerPC Altivec/VMX registers */
+#define NT_PPC_SPE     0x101           /* PowerPC SPE/EVR registers */
+#define NT_386_TLS     0x200           /* i386 TLS slots (struct user_desc) */
 
 
 /* Note header in a PT_NOTE section */