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>
This commit is contained in:
parent
17d36707dd
commit
0b4dc7c352
4 changed files with 11 additions and 31 deletions
|
@ -14,8 +14,6 @@ header-y += vsyscall32.h
|
||||||
|
|
||||||
unifdef-y += a.out_32.h
|
unifdef-y += a.out_32.h
|
||||||
unifdef-y += a.out_64.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_32.h
|
||||||
unifdef-y += byteorder_64.h
|
unifdef-y += byteorder_64.h
|
||||||
unifdef-y += elf_32.h
|
unifdef-y += elf_32.h
|
||||||
|
|
|
@ -1,13 +1,12 @@
|
||||||
#ifdef __KERNEL__
|
#ifndef _ASM_X86_AUXVEC_H
|
||||||
# ifdef CONFIG_X86_32
|
#define _ASM_X86_AUXVEC_H
|
||||||
# include "auxvec_32.h"
|
/*
|
||||||
# else
|
* Architecture-neutral AT_ values in 0-17, leave some room
|
||||||
# include "auxvec_64.h"
|
* for more of them, start the x86-specific ones at 32.
|
||||||
# endif
|
*/
|
||||||
#else
|
#ifdef __i386__
|
||||||
# ifdef __i386__
|
#define AT_SYSINFO 32
|
||||||
# include "auxvec_32.h"
|
#endif
|
||||||
# else
|
#define AT_SYSINFO_EHDR 33
|
||||||
# include "auxvec_64.h"
|
|
||||||
# endif
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -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
|
|
|
@ -1,6 +0,0 @@
|
||||||
#ifndef __ASM_X86_64_AUXVEC_H
|
|
||||||
#define __ASM_X86_64_AUXVEC_H
|
|
||||||
|
|
||||||
#define AT_SYSINFO_EHDR 33
|
|
||||||
|
|
||||||
#endif
|
|
Loading…
Add table
Reference in a new issue