diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-15 23:28:19 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de> | 2007-10-17 20:17:13 +0200 |
| commit | 0b4dc7c3524c59fae4c369ee5de274275b95d053 (patch) | |
| tree | b1ad6cf3a1a4d11416c9dbd4da3afc2fa5fc84a3 | |
| parent | 17d36707dd9c5c3c4ef09a278ee7444cfc60481e (diff) | |
| download | kernel_samsung_aries-0b4dc7c3524c59fae4c369ee5de274275b95d053.zip kernel_samsung_aries-0b4dc7c3524c59fae4c369ee5de274275b95d053.tar.gz kernel_samsung_aries-0b4dc7c3524c59fae4c369ee5de274275b95d053.tar.bz2 | |
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>
| -rw-r--r-- | include/asm-x86/Kbuild | 2 | ||||
| -rw-r--r-- | include/asm-x86/auxvec.h | 23 | ||||
| -rw-r--r-- | include/asm-x86/auxvec_32.h | 11 | ||||
| -rw-r--r-- | include/asm-x86/auxvec_64.h | 6 |
4 files changed, 11 insertions, 31 deletions
diff --git a/include/asm-x86/Kbuild b/include/asm-x86/Kbuild index bf98b67..d300cff 100644 --- a/include/asm-x86/Kbuild +++ b/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/include/asm-x86/auxvec.h b/include/asm-x86/auxvec.h index 7ff866f..87f5e6d 100644 --- a/include/asm-x86/auxvec.h +++ b/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/include/asm-x86/auxvec_32.h b/include/asm-x86/auxvec_32.h deleted file mode 100644 index 395e130..0000000 --- a/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/include/asm-x86/auxvec_64.h b/include/asm-x86/auxvec_64.h deleted file mode 100644 index 1d5ab0d..0000000 --- a/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 |