diff options
author | Jon Loeliger <linuxppc@jdl.com> | 2005-09-17 11:39:46 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2005-09-18 19:38:50 -0400 |
commit | fbcd54b1e67ffa27f2b2ce087ee300138828d730 (patch) | |
tree | 626a265159b1feed80f72a78b027951d421d64d1 | |
parent | 6c45ab992e4299c869fb26427944a8f8ea177024 (diff) |
[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>
-rw-r--r-- | include/asm-powerpc/sections.h (renamed from include/asm-ppc64/sections.h) | 21 | ||||
-rw-r--r-- | include/asm-ppc/sections.h | 33 |
2 files changed, 6 insertions, 48 deletions
diff --git a/include/asm-ppc64/sections.h b/include/asm-powerpc/sections.h index 308ca6f5ced2..47be2ac2a925 100644 --- a/include/asm-ppc64/sections.h +++ b/include/asm-powerpc/sections.h | |||
@@ -1,22 +1,11 @@ | |||
1 | #ifndef _PPC64_SECTIONS_H | 1 | #ifndef _ASM_POWERPC_SECTIONS_H |
2 | #define _PPC64_SECTIONS_H | 2 | #define _ASM_POWERPC_SECTIONS_H |
3 | |||
4 | extern char _end[]; | ||
5 | 3 | ||
6 | #include <asm-generic/sections.h> | 4 | #include <asm-generic/sections.h> |
7 | 5 | ||
8 | #define __pmac | 6 | #ifdef __powerpc64__ |
9 | #define __pmacdata | ||
10 | |||
11 | #define __prep | ||
12 | #define __prepdata | ||
13 | |||
14 | #define __chrp | ||
15 | #define __chrpdata | ||
16 | |||
17 | #define __openfirmware | ||
18 | #define __openfirmwaredata | ||
19 | 7 | ||
8 | extern char _end[]; | ||
20 | 9 | ||
21 | static inline int in_kernel_text(unsigned long addr) | 10 | static inline int in_kernel_text(unsigned long addr) |
22 | { | 11 | { |
@@ -27,3 +16,5 @@ static inline int in_kernel_text(unsigned long addr) | |||
27 | } | 16 | } |
28 | 17 | ||
29 | #endif | 18 | #endif |
19 | |||
20 | #endif /* _ASM_POWERPC_SECTIONS_H */ | ||
diff --git a/include/asm-ppc/sections.h b/include/asm-ppc/sections.h deleted file mode 100644 index ba8f43ac9bf3..000000000000 --- a/include/asm-ppc/sections.h +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | #ifdef __KERNEL__ | ||
2 | #ifndef _PPC_SECTIONS_H | ||
3 | #define _PPC_SECTIONS_H | ||
4 | |||
5 | #include <asm-generic/sections.h> | ||
6 | |||
7 | #define __pmac __attribute__ ((__section__ (".pmac.text"))) | ||
8 | #define __pmacdata __attribute__ ((__section__ (".pmac.data"))) | ||
9 | #define __pmacfunc(__argpmac) \ | ||
10 | __argpmac __pmac; \ | ||
11 | __argpmac | ||
12 | |||
13 | #define __prep __attribute__ ((__section__ (".prep.text"))) | ||
14 | #define __prepdata __attribute__ ((__section__ (".prep.data"))) | ||
15 | #define __prepfunc(__argprep) \ | ||
16 | __argprep __prep; \ | ||
17 | __argprep | ||
18 | |||
19 | #define __chrp __attribute__ ((__section__ (".chrp.text"))) | ||
20 | #define __chrpdata __attribute__ ((__section__ (".chrp.data"))) | ||
21 | #define __chrpfunc(__argchrp) \ | ||
22 | __argchrp __chrp; \ | ||
23 | __argchrp | ||
24 | |||
25 | /* this is actually just common chrp/pmac code, not OF code -- Cort */ | ||
26 | #define __openfirmware __attribute__ ((__section__ (".openfirmware.text"))) | ||
27 | #define __openfirmwaredata __attribute__ ((__section__ (".openfirmware.data"))) | ||
28 | #define __openfirmwarefunc(__argopenfirmware) \ | ||
29 | __argopenfirmware __openfirmware; \ | ||
30 | __argopenfirmware | ||
31 | |||
32 | #endif /* _PPC_SECTIONS_H */ | ||
33 | #endif /* __KERNEL__ */ | ||