diff options
author | Nick Kralevich <nnk@google.com> | 2013-01-11 18:31:17 -0800 |
---|---|---|
committer | Nick Kralevich <nnk@google.com> | 2013-01-14 11:47:54 -0800 |
commit | 3e7725d717a88685b8e3ce499f04553a4da3ee04 (patch) | |
tree | 4066f5b767e74e04610433fe55c0d08f8c686944 | |
parent | c80253d4a1205fb0525e878263754ce68dc2db7c (diff) | |
download | kernel-headers-3e7725d717a88685b8e3ce499f04553a4da3ee04.tar.gz |
update auxvec.h from upstream.
Pull an updated copy of auxvec.h from the upstream Linux
kernel at b719f43059903820c31edb30f4663a2818836e7f
Change-Id: I4e0d271337e5034d75c7c90e7f4151a9b73b3397
-rw-r--r-- | original/asm-x86/auxvec.h | 7 | ||||
-rw-r--r-- | original/linux/auxvec.h | 29 | ||||
-rw-r--r-- | original/uapi/linux/auxvec.h | 35 |
3 files changed, 45 insertions, 26 deletions
diff --git a/original/asm-x86/auxvec.h b/original/asm-x86/auxvec.h index 87f5e6d..77203ac 100644 --- a/original/asm-x86/auxvec.h +++ b/original/asm-x86/auxvec.h @@ -9,4 +9,11 @@ #endif #define AT_SYSINFO_EHDR 33 +/* entries in ARCH_DLINFO: */ +#if defined(CONFIG_IA32_EMULATION) || !defined(CONFIG_X86_64) +# define AT_VECTOR_SIZE_ARCH 2 +#else /* else it's non-compat x86-64 */ +# define AT_VECTOR_SIZE_ARCH 1 #endif + +#endif /* _ASM_X86_AUXVEC_H */ diff --git a/original/linux/auxvec.h b/original/linux/auxvec.h index d2bc0d6..669fef5 100644 --- a/original/linux/auxvec.h +++ b/original/linux/auxvec.h @@ -1,31 +1,8 @@ #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 44 /* Size of auxiliary table. */ +#include <uapi/linux/auxvec.h> +#define AT_VECTOR_SIZE_BASE 19 /* NEW_AUX_ENT entries in auxiliary table */ + /* number of "#define AT_.*" above, minus {AT_NULL, AT_IGNORE, AT_NOTELF} */ #endif /* _LINUX_AUXVEC_H */ diff --git a/original/uapi/linux/auxvec.h b/original/uapi/linux/auxvec.h new file mode 100644 index 0000000..61594d5 --- /dev/null +++ b/original/uapi/linux/auxvec.h @@ -0,0 +1,35 @@ +#ifndef _UAPI_LINUX_AUXVEC_H +#define _UAPI_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 */ +/* AT_* values 18 through 22 are reserved */ +#define AT_SECURE 23 /* secure mode boolean */ +#define AT_BASE_PLATFORM 24 /* string identifying real platform, may + * differ from AT_PLATFORM. */ +#define AT_RANDOM 25 /* address of 16 random bytes */ + +#define AT_EXECFN 31 /* filename of program */ + + +#endif /* _UAPI_LINUX_AUXVEC_H */ |