x86: unify include/asm/auxvec_32/64.h

Same file, except for whitespace, comment formatting and the AT_SYSINFO define for 32bit Signed-off-by: Thomas Gleixner <[email protected]>
RyanHsu · Oct 17, 2007 · 0b4dc7c · 0b4dc7c
1 parent 17d3670
commit 0b4dc7c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 31 deletions.
diff --git a/include/asm-x86/Kbuild b/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/include/asm-x86/auxvec.h b/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/include/asm-x86/auxvec_32.h b/include/asm-x86/auxvec_32.h
diff --git a/include/asm-x86/auxvec_64.h b/include/asm-x86/auxvec_64.h