commit 0b4dc7c3524c59fae4c369ee5de274275b95d053
author Thomas Gleixner <tglx@linutronix.de> Mon Oct 15 23:28:19 2007 +0200
committer Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de> Wed Oct 17 20:17:13 2007 +0200
tree b1ad6cf3a1a4d11416c9dbd4da3afc2fa5fc84a3
parent 17d36707dd9c5c3c4ef09a278ee7444cfc60481e

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 <tglx@linutronix.de>

include/asm-x86/auxvec.h

diff --git a/include/asm-x86/auxvec.h b/include/asm-x86/auxvec.h
index 7ff866f..87f5e6d 100644
--- 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