---

yaml --- r: 71030 b: refs/heads/master c: 0b4dc7c h: refs/heads/master v: v3
git-mirror · Oct 17, 2007 · c1afedd · c1afedd
1 parent 95d7be8
commit c1afedd
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 32 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17d36707dd9c5c3c4ef09a278ee7444cfc60481e
+refs/heads/master: 0b4dc7c3524c59fae4c369ee5de274275b95d053
diff --git a/trunk/include/asm-x86/Kbuild b/trunk/include/asm-x86/Kbuild
@@ -14,8 +14,6 @@ header-y += vsyscall32.h
 
 unifdef-y += a.out_32.h
 unifdef-y += a.out_64.h
-unifdef-y += auxvec_32.h
-unifdef-y += auxvec_64.h
 unifdef-y += byteorder_32.h
 unifdef-y += byteorder_64.h
 unifdef-y += elf_32.h

diff --git a/trunk/include/asm-x86/auxvec.h b/trunk/include/asm-x86/auxvec.h
@@ -1,13 +1,12 @@
-#ifdef __KERNEL__
-# ifdef CONFIG_X86_32
-#  include "auxvec_32.h"
-# else
-#  include "auxvec_64.h"
-# endif
-#else
-# ifdef __i386__
-#  include "auxvec_32.h"
-# else
-#  include "auxvec_64.h"
-# endif
+#ifndef _ASM_X86_AUXVEC_H
+#define _ASM_X86_AUXVEC_H
+/*
+ * Architecture-neutral AT_ values in 0-17, leave some room
+ * for more of them, start the x86-specific ones at 32.
+ */
+#ifdef __i386__
+#define AT_SYSINFO		32
+#endif
+#define AT_SYSINFO_EHDR		33
+
 #endif
diff --git a/trunk/include/asm-x86/auxvec_32.h b/trunk/include/asm-x86/auxvec_32.h
diff --git a/trunk/include/asm-x86/auxvec_64.h b/trunk/include/asm-x86/auxvec_64.h