diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2007-10-15 17:28:19 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de> | 2007-10-17 14:17:13 -0400 |
| commit | 0b4dc7c3524c59fae4c369ee5de274275b95d053 (patch) | |
| tree | b1ad6cf3a1a4d11416c9dbd4da3afc2fa5fc84a3 | |
| parent | 17d36707dd9c5c3c4ef09a278ee7444cfc60481e (diff) | |
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 bf98b67d3822..d300cff2201e 100644 --- a/include/asm-x86/Kbuild +++ b/include/asm-x86/Kbuild | |||
| @@ -14,8 +14,6 @@ header-y += vsyscall32.h | |||
| 14 | 14 | ||
| 15 | unifdef-y += a.out_32.h | 15 | unifdef-y += a.out_32.h |
| 16 | unifdef-y += a.out_64.h | 16 | unifdef-y += a.out_64.h |
| 17 | unifdef-y += auxvec_32.h | ||
| 18 | unifdef-y += auxvec_64.h | ||
| 19 | unifdef-y += byteorder_32.h | 17 | unifdef-y += byteorder_32.h |
| 20 | unifdef-y += byteorder_64.h | 18 | unifdef-y += byteorder_64.h |
| 21 | unifdef-y += elf_32.h | 19 | unifdef-y += elf_32.h |
diff --git a/include/asm-x86/auxvec.h b/include/asm-x86/auxvec.h index 7ff866f829ca..87f5e6d5a020 100644 --- a/include/asm-x86/auxvec.h +++ b/include/asm-x86/auxvec.h | |||
| @@ -1,13 +1,12 @@ | |||
| 1 | #ifdef __KERNEL__ | 1 | #ifndef _ASM_X86_AUXVEC_H |
| 2 | # ifdef CONFIG_X86_32 | 2 | #define _ASM_X86_AUXVEC_H |
| 3 | # include "auxvec_32.h" | 3 | /* |
| 4 | # else | 4 | * Architecture-neutral AT_ values in 0-17, leave some room |
| 5 | # include "auxvec_64.h" | 5 | * for more of them, start the x86-specific ones at 32. |
| 6 | # endif | 6 | */ |
| 7 | #else | 7 | #ifdef __i386__ |
| 8 | # ifdef __i386__ | 8 | #define AT_SYSINFO 32 |
| 9 | # include "auxvec_32.h" | 9 | #endif |
| 10 | # else | 10 | #define AT_SYSINFO_EHDR 33 |
| 11 | # include "auxvec_64.h" | 11 | |
| 12 | # endif | ||
| 13 | #endif | 12 | #endif |
diff --git a/include/asm-x86/auxvec_32.h b/include/asm-x86/auxvec_32.h deleted file mode 100644 index 395e13016bfb..000000000000 --- a/include/asm-x86/auxvec_32.h +++ /dev/null | |||
| @@ -1,11 +0,0 @@ | |||
| 1 | #ifndef __ASMi386_AUXVEC_H | ||
| 2 | #define __ASMi386_AUXVEC_H | ||
| 3 | |||
| 4 | /* | ||
| 5 | * Architecture-neutral AT_ values in 0-17, leave some room | ||
| 6 | * for more of them, start the x86-specific ones at 32. | ||
| 7 | */ | ||
| 8 | #define AT_SYSINFO 32 | ||
| 9 | #define AT_SYSINFO_EHDR 33 | ||
| 10 | |||
| 11 | #endif | ||
diff --git a/include/asm-x86/auxvec_64.h b/include/asm-x86/auxvec_64.h deleted file mode 100644 index 1d5ab0d03950..000000000000 --- a/include/asm-x86/auxvec_64.h +++ /dev/null | |||
| @@ -1,6 +0,0 @@ | |||
| 1 | #ifndef __ASM_X86_64_AUXVEC_H | ||
| 2 | #define __ASM_X86_64_AUXVEC_H | ||
| 3 | |||
| 4 | #define AT_SYSINFO_EHDR 33 | ||
| 5 | |||
| 6 | #endif | ||