[PATCH] auxiliary vector cleanups

The size of auxiliary vector is fixed at 42 in linux/sched.h.  But it isn't
very obvious when looking at linux/elf.h.  This patch adds AT_VECTOR_SIZE
so that we can change it if necessary when a new vector is added.

Because of include file ordering problems, doing this necessitated the
extraction of the AT_* symbols into a standalone header file.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/include/asm-alpha/auxvec.h b/include/asm-alpha/auxvec.h
new file mode 100644 (file)
index 0000000..e96fe88
--- /dev/null
+++ b/include/asm-alpha/auxvec.h
@@ -0,0 +1,24 @@
+#ifndef __ASM_ALPHA_AUXVEC_H
+#define __ASM_ALPHA_AUXVEC_H
+
+/* Reserve these numbers for any future use of a VDSO.  */
+#if 0
+#define AT_SYSINFO             32
+#define AT_SYSINFO_EHDR                33
+#endif
+
+/* More complete cache descriptions than AT_[DIU]CACHEBSIZE.  If the
+   value is -1, then the cache doesn't exist.  Otherwise:
+
+      bit 0-3:   Cache set-associativity; 0 means fully associative.
+      bit 4-7:   Log2 of cacheline size.
+      bit 8-31:          Size of the entire cache >> 8.
+      bit 32-63:  Reserved.
+*/
+
+#define AT_L1I_CACHESHAPE      34
+#define AT_L1D_CACHESHAPE      35
+#define AT_L2_CACHESHAPE       36
+#define AT_L3_CACHESHAPE       37
+
+#endif /* __ASM_ALPHA_AUXVEC_H */

diff --git a/include/asm-alpha/elf.h b/include/asm-alpha/elf.h
index e94a945..6c2d78f 100644 (file)
--- a/include/asm-alpha/elf.h
+++ b/include/asm-alpha/elf.h
@@ -1,6 +1,8 @@
 #ifndef __ASM_ALPHA_ELF_H
 #define __ASM_ALPHA_ELF_H
 
+#include <asm/auxvec.h>
+
 /* Special values for the st_other field in the symbol table.  */
 
 #define STO_ALPHA_NOPV         0x80
@@ -142,26 +144,6 @@ extern int dump_elf_task_fp(elf_fpreg_t *dest, struct task_struct *task);
        : amask (AMASK_CIX) ? "ev6" : "ev67");  \
 })
 
-/* Reserve these numbers for any future use of a VDSO.  */
-#if 0
-#define AT_SYSINFO             32
-#define AT_SYSINFO_EHDR                33
-#endif
-
-/* More complete cache descriptions than AT_[DIU]CACHEBSIZE.  If the
-   value is -1, then the cache doesn't exist.  Otherwise:
-
-      bit 0-3:   Cache set-associativity; 0 means fully associative.
-      bit 4-7:   Log2 of cacheline size.
-      bit 8-31:          Size of the entire cache >> 8.
-      bit 32-63:  Reserved.
-*/
-
-#define AT_L1I_CACHESHAPE      34
-#define AT_L1D_CACHESHAPE      35
-#define AT_L2_CACHESHAPE       36
-#define AT_L3_CACHESHAPE       37
-
 #ifdef __KERNEL__
 
 #define SET_PERSONALITY(EX, IBCS2)                             \

diff --cc include/asm-arm/auxvec.h
Simple merge

diff --cc include/asm-arm26/auxvec.h
Simple merge

diff --cc include/asm-cris/auxvec.h
Simple merge

diff --cc include/asm-frv/auxvec.h
Simple merge

diff --cc include/asm-h8300/auxvec.h
Simple merge

diff --cc include/asm-i386/auxvec.h
Simple merge

diff --cc include/asm-i386/elf.h
Simple merge

diff --cc include/asm-ia64/auxvec.h
Simple merge

diff --cc include/asm-ia64/elf.h
Simple merge

diff --cc include/asm-m32r/auxvec.h
Simple merge

diff --cc include/asm-m68k/auxvec.h
Simple merge

diff --cc include/asm-m68knommu/auxvec.h
Simple merge

diff --cc include/asm-mips/auxvec.h
Simple merge

diff --cc include/asm-parisc/auxvec.h
Simple merge

diff --cc include/asm-ppc/auxvec.h
Simple merge

diff --cc include/asm-ppc/elf.h
Simple merge

diff --cc include/asm-ppc64/auxvec.h
Simple merge

diff --cc include/asm-ppc64/elf.h
Simple merge

diff --cc include/asm-s390/auxvec.h
Simple merge

diff --cc include/asm-sh/auxvec.h
Simple merge

diff --cc include/asm-sh64/auxvec.h
Simple merge

diff --cc include/asm-sparc/auxvec.h
Simple merge

diff --cc include/asm-sparc64/auxvec.h
Simple merge

diff --cc include/asm-um/auxvec.h
Simple merge

diff --cc include/asm-v850/auxvec.h
Simple merge

diff --cc include/asm-x86_64/auxvec.h
Simple merge

diff --cc include/asm-xtensa/auxvec.h
Simple merge

diff --cc include/linux/auxvec.h
Simple merge

diff --cc include/linux/elf.h
Simple merge

diff --cc include/linux/sched.h
Simple merge