[POWERPC] Support nested cpu feature sections
This patch adds some macros that can be used with an explicit label in order to nest cpu features. This should be used very careful but is necessary for the upcoming cell TB fixup. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Acked-by: Olof Johansson <olof@lixom.net> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
42c4aaadb7
commit
7aeb732428
|
@ -434,30 +434,34 @@ static inline int cpu_has_feature(unsigned long feature)
|
|||
|
||||
#ifdef __ASSEMBLY__
|
||||
|
||||
#define BEGIN_FTR_SECTION 98:
|
||||
#define BEGIN_FTR_SECTION_NESTED(label) label:
|
||||
#define BEGIN_FTR_SECTION BEGIN_FTR_SECTION_NESTED(98)
|
||||
|
||||
#ifndef __powerpc64__
|
||||
#define END_FTR_SECTION(msk, val) \
|
||||
#define END_FTR_SECTION_NESTED(msk, val, label) \
|
||||
99: \
|
||||
.section __ftr_fixup,"a"; \
|
||||
.align 2; \
|
||||
.long msk; \
|
||||
.long val; \
|
||||
.long 98b; \
|
||||
.long label##b; \
|
||||
.long 99b; \
|
||||
.previous
|
||||
#else /* __powerpc64__ */
|
||||
#define END_FTR_SECTION(msk, val) \
|
||||
#define END_FTR_SECTION_NESTED(msk, val, label) \
|
||||
99: \
|
||||
.section __ftr_fixup,"a"; \
|
||||
.align 3; \
|
||||
.llong msk; \
|
||||
.llong val; \
|
||||
.llong 98b; \
|
||||
.llong label##b; \
|
||||
.llong 99b; \
|
||||
.previous
|
||||
#endif /* __powerpc64__ */
|
||||
|
||||
#define END_FTR_SECTION(msk, val) \
|
||||
END_FTR_SECTION_NESTED(msk, val, 98)
|
||||
|
||||
#define END_FTR_SECTION_IFSET(msk) END_FTR_SECTION((msk), (msk))
|
||||
#define END_FTR_SECTION_IFCLR(msk) END_FTR_SECTION((msk), 0)
|
||||
#endif /* __ASSEMBLY__ */
|
||||
|
|
Loading…
Reference in a new issue