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

Commit 5bfc8265 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras
Browse files

[PATCH] powerpc: Merge include/asm-ppc*/a.out.h into include/asm-powerpc 



Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 564ee7a5

include/asm-ppc64/a.out.h→include/asm-powerpc/a.out.h

+9 −12
Original line number Diff line number Diff line 
#ifndef __PPC64_A_OUT_H__

#define __PPC64_A_OUT_H__



/*

 * c 2001 PPC 64 Team, IBM Corp

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; either version

 * 2 of the License, or (at your option) any later version.

 */

#ifndef _ASM_POWERPC_A_OUT_H

#define _ASM_POWERPC_A_OUT_H



struct exec

{
@@ -27,6 +18,7 @@ struct exec 
#define N_SYMSIZE(a)	((a).a_syms)



#ifdef __KERNEL__

#ifdef __powerpc64__



#define STACK_TOP_USER64 TASK_SIZE_USER64

#define STACK_TOP_USER32 TASK_SIZE_USER32
@@ -34,6 +26,11 @@ struct exec 
#define STACK_TOP (test_thread_flag(TIF_32BIT) ? \

		   STACK_TOP_USER32 : STACK_TOP_USER64)



#else /* __powerpc64__ */



#define STACK_TOP TASK_SIZE



#endif /* __powerpc64__ */

#endif /* __KERNEL__ */



#endif /* __PPC64_A_OUT_H__ */
 
#endif /* _ASM_POWERPC_A_OUT_H */

include/asm-ppc/a.out.h

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
#ifndef __PPC_A_OUT_H__

#define __PPC_A_OUT_H__



/* grabbed from the intel stuff  */

#define STACK_TOP TASK_SIZE





struct exec

{

  unsigned long a_info;		/* Use macros N_MAGIC, etc for access */

  unsigned a_text;		/* length of text, in bytes */

  unsigned a_data;		/* length of data, in bytes */

  unsigned a_bss;		/* length of uninitialized data area for file, in bytes */

  unsigned a_syms;		/* length of symbol table data in file, in bytes */

  unsigned a_entry;		/* start address */

  unsigned a_trsize;		/* length of relocation info for text, in bytes */

  unsigned a_drsize;		/* length of relocation info for data, in bytes */

};





#define N_TRSIZE(a)	((a).a_trsize)

#define N_DRSIZE(a)	((a).a_drsize)

#define N_SYMSIZE(a)	((a).a_syms)





#endif