[PATCH] powerpc: Merge simplified sections.h into asm-powerpc

Here is a new patch that removes all notion of the pmac, prep,
chrp and openfirmware initialization sections, and then unifies
the sections.h files without those __pmac, etc, sections identifiers
cluttering things up.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Jon Loeliger 2005-09-17 10:39:46 -05:00 committed by Paul Mackerras
parent 6c45ab992e
commit fbcd54b1e6
2 changed files with 6 additions and 48 deletions

View File

@ -1,22 +1,11 @@
#ifndef _PPC64_SECTIONS_H #ifndef _ASM_POWERPC_SECTIONS_H
#define _PPC64_SECTIONS_H #define _ASM_POWERPC_SECTIONS_H
extern char _end[];
#include <asm-generic/sections.h> #include <asm-generic/sections.h>
#define __pmac #ifdef __powerpc64__
#define __pmacdata
#define __prep
#define __prepdata
#define __chrp
#define __chrpdata
#define __openfirmware
#define __openfirmwaredata
extern char _end[];
static inline int in_kernel_text(unsigned long addr) static inline int in_kernel_text(unsigned long addr)
{ {
@ -27,3 +16,5 @@ static inline int in_kernel_text(unsigned long addr)
} }
#endif #endif
#endif /* _ASM_POWERPC_SECTIONS_H */

View File

@ -1,33 +0,0 @@
#ifdef __KERNEL__
#ifndef _PPC_SECTIONS_H
#define _PPC_SECTIONS_H
#include <asm-generic/sections.h>
#define __pmac __attribute__ ((__section__ (".pmac.text")))
#define __pmacdata __attribute__ ((__section__ (".pmac.data")))
#define __pmacfunc(__argpmac) \
__argpmac __pmac; \
__argpmac
#define __prep __attribute__ ((__section__ (".prep.text")))
#define __prepdata __attribute__ ((__section__ (".prep.data")))
#define __prepfunc(__argprep) \
__argprep __prep; \
__argprep
#define __chrp __attribute__ ((__section__ (".chrp.text")))
#define __chrpdata __attribute__ ((__section__ (".chrp.data")))
#define __chrpfunc(__argchrp) \
__argchrp __chrp; \
__argchrp
/* this is actually just common chrp/pmac code, not OF code -- Cort */
#define __openfirmware __attribute__ ((__section__ (".openfirmware.text")))
#define __openfirmwaredata __attribute__ ((__section__ (".openfirmware.data")))
#define __openfirmwarefunc(__argopenfirmware) \
__argopenfirmware __openfirmware; \
__argopenfirmware
#endif /* _PPC_SECTIONS_H */
#endif /* __KERNEL__ */