Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b4dc7c3 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Thomas Gleixner
Browse files

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: default avatarThomas Gleixner <tglx@linutronix.de>
parent 17d36707

include/asm-x86/Kbuild

+0 −2
Original line number Diff line number Diff line
@@ -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

include/asm-x86/auxvec.h

+11 −12
Original line number Diff line number Diff line 
#ifdef __KERNEL__

# ifdef CONFIG_X86_32

#  include "auxvec_32.h"

# else

#  include "auxvec_64.h"

# endif

#else

#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__

#  include "auxvec_32.h"

# else

#  include "auxvec_64.h"

#define AT_SYSINFO		32

#endif

#define AT_SYSINFO_EHDR		33



#endif

include/asm-x86/auxvec_32.h

deleted100644 → 0
+0 −11
Original line number Diff line number Diff line 
#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

include/asm-x86/auxvec_64.h

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
#ifndef __ASM_X86_64_AUXVEC_H

#define __ASM_X86_64_AUXVEC_H



#define AT_SYSINFO_EHDR		33



#endif