提交 36d57ac4 编写于 作者: H H. J. Lu 提交者: Linus Torvalds

[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: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 32605a18
#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 */
#ifndef __ASM_ALPHA_ELF_H #ifndef __ASM_ALPHA_ELF_H
#define __ASM_ALPHA_ELF_H #define __ASM_ALPHA_ELF_H
#include <asm/auxvec.h>
/* Special values for the st_other field in the symbol table. */ /* Special values for the st_other field in the symbol table. */
#define STO_ALPHA_NOPV 0x80 #define STO_ALPHA_NOPV 0x80
...@@ -142,26 +144,6 @@ extern int dump_elf_task_fp(elf_fpreg_t *dest, struct task_struct *task); ...@@ -142,26 +144,6 @@ extern int dump_elf_task_fp(elf_fpreg_t *dest, struct task_struct *task);
: amask (AMASK_CIX) ? "ev6" : "ev67"); \ : 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__ #ifdef __KERNEL__
#define SET_PERSONALITY(EX, IBCS2) \ #define SET_PERSONALITY(EX, IBCS2) \
......
#ifndef __ASMARM_AUXVEC_H
#define __ASMARM_AUXVEC_H
#endif
#ifndef __ASMARM_AUXVEC_H
#define __ASMARM_AUXVEC_H
#endif
#ifndef __ASMCRIS_AUXVEC_H
#define __ASMCRIS_AUXVEC_H
#endif
#ifndef __FRV_AUXVEC_H
#define __FRV_AUXVEC_H
#endif
#ifndef __ASMH8300_AUXVEC_H
#define __ASMH8300_AUXVEC_H
#endif
#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
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include <asm/user.h> #include <asm/user.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/system.h> /* for savesegment */ #include <asm/system.h> /* for savesegment */
#include <asm/auxvec.h>
#include <linux/utsname.h> #include <linux/utsname.h>
...@@ -109,13 +110,6 @@ typedef struct user_fxsr_struct elf_fpxregset_t; ...@@ -109,13 +110,6 @@ typedef struct user_fxsr_struct elf_fpxregset_t;
#define ELF_PLATFORM (system_utsname.machine) #define ELF_PLATFORM (system_utsname.machine)
/*
* 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
#ifdef __KERNEL__ #ifdef __KERNEL__
#define SET_PERSONALITY(ex, ibcs2) do { } while (0) #define SET_PERSONALITY(ex, ibcs2) do { } while (0)
......
#ifndef _ASM_IA64_AUXVEC_H
#define _ASM_IA64_AUXVEC_H
/*
* Architecture-neutral AT_ values are in the range 0-17. Leave some room for more of
* them, start the architecture-specific ones at 32.
*/
#define AT_SYSINFO 32
#define AT_SYSINFO_EHDR 33
#endif /* _ASM_IA64_AUXVEC_H */
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include <asm/fpu.h> #include <asm/fpu.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/auxvec.h>
/* /*
* This is used to ensure we don't load something for the wrong architecture. * This is used to ensure we don't load something for the wrong architecture.
...@@ -177,13 +178,6 @@ extern void ia64_elf_core_copy_regs (struct pt_regs *src, elf_gregset_t dst); ...@@ -177,13 +178,6 @@ extern void ia64_elf_core_copy_regs (struct pt_regs *src, elf_gregset_t dst);
relevant until we have real hardware to play with... */ relevant until we have real hardware to play with... */
#define ELF_PLATFORM NULL #define ELF_PLATFORM NULL
/*
* Architecture-neutral AT_ values are in the range 0-17. Leave some room for more of
* them, start the architecture-specific ones at 32.
*/
#define AT_SYSINFO 32
#define AT_SYSINFO_EHDR 33
#ifdef __KERNEL__ #ifdef __KERNEL__
#define SET_PERSONALITY(ex, ibcs2) set_personality(PER_LINUX) #define SET_PERSONALITY(ex, ibcs2) set_personality(PER_LINUX)
#define elf_read_implies_exec(ex, executable_stack) \ #define elf_read_implies_exec(ex, executable_stack) \
......
#ifndef _ASM_M32R__AUXVEC_H
#define _ASM_M32R__AUXVEC_H
#endif /* _ASM_M32R__AUXVEC_H */
#ifndef __ASMm68k_AUXVEC_H
#define __ASMm68k_AUXVEC_H
#endif
#ifndef __ASMm68k_AUXVEC_H
#define __ASMm68k_AUXVEC_H
#endif
#ifndef _ASM_AUXVEC_H
#define _ASM_AUXVEC_H
#endif /* _ASM_AUXVEC_H */
#ifndef __ASMPARISC_AUXVEC_H
#define __ASMPARISC_AUXVEC_H
#endif
#ifndef __PPC_AUXVEC_H
#define __PPC_AUXVEC_H
/*
* We need to put in some extra aux table entries to tell glibc what
* the cache block size is, so it can use the dcbz instruction safely.
*/
#define AT_DCACHEBSIZE 19
#define AT_ICACHEBSIZE 20
#define AT_UCACHEBSIZE 21
/* A special ignored type value for PPC, for glibc compatibility. */
#define AT_IGNOREPPC 22
#endif
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include <asm/types.h> #include <asm/types.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/cputable.h> #include <asm/cputable.h>
#include <asm/auxvec.h>
/* PowerPC relocations defined by the ABIs */ /* PowerPC relocations defined by the ABIs */
#define R_PPC_NONE 0 #define R_PPC_NONE 0
...@@ -122,16 +123,6 @@ extern int dump_task_fpu(struct task_struct *t, elf_fpregset_t *fpu); ...@@ -122,16 +123,6 @@ extern int dump_task_fpu(struct task_struct *t, elf_fpregset_t *fpu);
#define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX) #define SET_PERSONALITY(ex, ibcs2) set_personality((ibcs2)?PER_SVR4:PER_LINUX)
/*
* We need to put in some extra aux table entries to tell glibc what
* the cache block size is, so it can use the dcbz instruction safely.
*/
#define AT_DCACHEBSIZE 19
#define AT_ICACHEBSIZE 20
#define AT_UCACHEBSIZE 21
/* A special ignored type value for PPC, for glibc compatibility. */
#define AT_IGNOREPPC 22
extern int dcache_bsize; extern int dcache_bsize;
extern int icache_bsize; extern int icache_bsize;
extern int ucache_bsize; extern int ucache_bsize;
......
#ifndef __PPC64_AUXVEC_H
#define __PPC64_AUXVEC_H
/*
* We need to put in some extra aux table entries to tell glibc what
* the cache block size is, so it can use the dcbz instruction safely.
*/
#define AT_DCACHEBSIZE 19
#define AT_ICACHEBSIZE 20
#define AT_UCACHEBSIZE 21
/* A special ignored type value for PPC, for glibc compatibility. */
#define AT_IGNOREPPC 22
/* The vDSO location. We have to use the same value as x86 for glibc's
* sake :-)
*/
#define AT_SYSINFO_EHDR 33
#endif /* __PPC64_AUXVEC_H */
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include <asm/types.h> #include <asm/types.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
#include <asm/cputable.h> #include <asm/cputable.h>
#include <asm/auxvec.h>
/* PowerPC relocations defined by the ABIs */ /* PowerPC relocations defined by the ABIs */
#define R_PPC_NONE 0 #define R_PPC_NONE 0
...@@ -237,21 +238,6 @@ do { \ ...@@ -237,21 +238,6 @@ do { \
#endif #endif
/*
* We need to put in some extra aux table entries to tell glibc what
* the cache block size is, so it can use the dcbz instruction safely.
*/
#define AT_DCACHEBSIZE 19
#define AT_ICACHEBSIZE 20
#define AT_UCACHEBSIZE 21
/* A special ignored type value for PPC, for glibc compatibility. */
#define AT_IGNOREPPC 22
/* The vDSO location. We have to use the same value as x86 for glibc's
* sake :-)
*/
#define AT_SYSINFO_EHDR 33
extern int dcache_bsize; extern int dcache_bsize;
extern int icache_bsize; extern int icache_bsize;
extern int ucache_bsize; extern int ucache_bsize;
......
#ifndef __ASMS390_AUXVEC_H
#define __ASMS390_AUXVEC_H
#endif
#ifndef __ASM_SH_AUXVEC_H
#define __ASM_SH_AUXVEC_H
#endif /* __ASM_SH_AUXVEC_H */
#ifndef __ASM_SH64_AUXVEC_H
#define __ASM_SH64_AUXVEC_H
#endif /* __ASM_SH64_AUXVEC_H */
#ifndef __ASMSPARC_AUXVEC_H
#define __ASMSPARC_AUXVEC_H
#endif /* !(__ASMSPARC_AUXVEC_H) */
#ifndef __ASM_SPARC64_AUXVEC_H
#define __ASM_SPARC64_AUXVEC_H
#endif /* !(__ASM_SPARC64_AUXVEC_H) */
#ifndef __UM_AUXVEC_H
#define __UM_AUXVEC_H
#endif
#ifndef __V850_AUXVEC_H__
#define __V850_AUXVEC_H__
#endif /* __V850_AUXVEC_H__ */
#ifndef __ASM_X86_64_AUXVEC_H
#define __ASM_X86_64_AUXVEC_H
#endif
#ifndef __XTENSA_AUXVEC_H
#define __XTENSA_AUXVEC_H
#endif
#ifndef _LINUX_AUXVEC_H
#define _LINUX_AUXVEC_H
#include <asm/auxvec.h>
/* Symbolic values for the entries in the auxiliary table
put on the initial stack */
#define AT_NULL 0 /* end of vector */
#define AT_IGNORE 1 /* entry should be ignored */
#define AT_EXECFD 2 /* file descriptor of program */
#define AT_PHDR 3 /* program headers for program */
#define AT_PHENT 4 /* size of program header entry */
#define AT_PHNUM 5 /* number of program headers */
#define AT_PAGESZ 6 /* system page size */
#define AT_BASE 7 /* base address of interpreter */
#define AT_FLAGS 8 /* flags */
#define AT_ENTRY 9 /* entry point of program */
#define AT_NOTELF 10 /* program is not ELF */
#define AT_UID 11 /* real uid */
#define AT_EUID 12 /* effective uid */
#define AT_GID 13 /* real gid */
#define AT_EGID 14 /* effective gid */
#define AT_PLATFORM 15 /* string identifying CPU for optimizations */
#define AT_HWCAP 16 /* arch dependent hints at CPU capabilities */
#define AT_CLKTCK 17 /* frequency at which times() increments */
#define AT_SECURE 23 /* secure mode boolean */
#define AT_VECTOR_SIZE 42 /* Size of auxiliary table. */
#endif /* _LINUX_AUXVEC_H */
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#define _LINUX_ELF_H #define _LINUX_ELF_H
#include <linux/types.h> #include <linux/types.h>
#include <linux/auxvec.h>
#include <asm/elf.h> #include <asm/elf.h>
#ifndef elf_read_implies_exec #ifndef elf_read_implies_exec
...@@ -158,29 +159,6 @@ typedef __s64 Elf64_Sxword; ...@@ -158,29 +159,6 @@ typedef __s64 Elf64_Sxword;
#define ELF64_ST_BIND(x) ELF_ST_BIND(x) #define ELF64_ST_BIND(x) ELF_ST_BIND(x)
#define ELF64_ST_TYPE(x) ELF_ST_TYPE(x) #define ELF64_ST_TYPE(x) ELF_ST_TYPE(x)
/* Symbolic values for the entries in the auxiliary table
put on the initial stack */
#define AT_NULL 0 /* end of vector */
#define AT_IGNORE 1 /* entry should be ignored */
#define AT_EXECFD 2 /* file descriptor of program */
#define AT_PHDR 3 /* program headers for program */
#define AT_PHENT 4 /* size of program header entry */
#define AT_PHNUM 5 /* number of program headers */
#define AT_PAGESZ 6 /* system page size */
#define AT_BASE 7 /* base address of interpreter */
#define AT_FLAGS 8 /* flags */
#define AT_ENTRY 9 /* entry point of program */
#define AT_NOTELF 10 /* program is not ELF */
#define AT_UID 11 /* real uid */
#define AT_EUID 12 /* effective uid */
#define AT_GID 13 /* real gid */
#define AT_EGID 14 /* effective gid */
#define AT_PLATFORM 15 /* string identifying CPU for optimizations */
#define AT_HWCAP 16 /* arch dependent hints at CPU capabilities */
#define AT_CLKTCK 17 /* frequency at which times() increments */
#define AT_SECURE 23 /* secure mode boolean */
typedef struct dynamic{ typedef struct dynamic{
Elf32_Sword d_tag; Elf32_Sword d_tag;
union{ union{
......
...@@ -35,6 +35,8 @@ ...@@ -35,6 +35,8 @@
#include <linux/topology.h> #include <linux/topology.h>
#include <linux/seccomp.h> #include <linux/seccomp.h>
#include <linux/auxvec.h> /* For AT_VECTOR_SIZE */
struct exec_domain; struct exec_domain;
/* /*
...@@ -261,7 +263,7 @@ struct mm_struct { ...@@ -261,7 +263,7 @@ struct mm_struct {
mm_counter_t _rss; mm_counter_t _rss;
mm_counter_t _anon_rss; mm_counter_t _anon_rss;
unsigned long saved_auxv[42]; /* for /proc/PID/auxv */ unsigned long saved_auxv[AT_VECTOR_SIZE]; /* for /proc/PID/auxv */
unsigned dumpable:2; unsigned dumpable:2;
cpumask_t cpu_vm_mask; cpumask_t cpu_vm_mask;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册