From c1afedd9655164ef7a9e54bab0af17ac47f1ce18 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Mon, 15 Oct 2007 23:28:19 +0200
Subject: [PATCH] --- yaml --- r: 71030 b: refs/heads/master c:
 0b4dc7c3524c59fae4c369ee5de274275b95d053 h: refs/heads/master v: v3

---
 [refs]                            |  2 +-
 trunk/include/asm-x86/Kbuild      |  2 --
 trunk/include/asm-x86/auxvec.h    | 23 +++++++++++------------
 trunk/include/asm-x86/auxvec_32.h | 11 -----------
 trunk/include/asm-x86/auxvec_64.h |  6 ------
 5 files changed, 12 insertions(+), 32 deletions(-)
 delete mode 100644 trunk/include/asm-x86/auxvec_32.h
 delete mode 100644 trunk/include/asm-x86/auxvec_64.h

diff --git a/[refs] b/[refs]
index b65afc3daacc..1d72e92dfe95 100644
--- 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
index bf98b67d3822..d300cff2201e 100644
--- 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
index 7ff866f829ca..87f5e6d5a020 100644
--- 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
deleted file mode 100644
index 395e13016bfb..000000000000
--- a/trunk/include/asm-x86/auxvec_32.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef __ASMi386_AUXVEC_H
-#define __ASMi386_AUXVEC_H
-
-/*
- * Architecture-neutral AT_ values in 0-17, leave some room
- * for more of them, start the x86-specific ones at 32.
- */
-#define AT_SYSINFO		32
-#define AT_SYSINFO_EHDR		33
-
-#endif
diff --git a/trunk/include/asm-x86/auxvec_64.h b/trunk/include/asm-x86/auxvec_64.h
deleted file mode 100644
index 1d5ab0d03950..000000000000
--- a/trunk/include/asm-x86/auxvec_64.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_X86_64_AUXVEC_H
-#define __ASM_X86_64_AUXVEC_H
-
-#define AT_SYSINFO_EHDR		33
-
-#endif