diff options
Diffstat (limited to 'include/asm-powerpc/cputable.h')
-rw-r--r-- | include/asm-powerpc/cputable.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/include/asm-powerpc/cputable.h b/include/asm-powerpc/cputable.h index 3189ac5d0a69..0d96b0284a73 100644 --- a/include/asm-powerpc/cputable.h +++ b/include/asm-powerpc/cputable.h | |||
@@ -32,6 +32,7 @@ | |||
32 | #ifdef __KERNEL__ | 32 | #ifdef __KERNEL__ |
33 | 33 | ||
34 | #include <asm/asm-compat.h> | 34 | #include <asm/asm-compat.h> |
35 | #include <asm/feature-fixups.h> | ||
35 | 36 | ||
36 | #ifndef __ASSEMBLY__ | 37 | #ifndef __ASSEMBLY__ |
37 | 38 | ||
@@ -489,18 +490,5 @@ static inline int cpu_has_feature(unsigned long feature) | |||
489 | 490 | ||
490 | #endif /* !__ASSEMBLY__ */ | 491 | #endif /* !__ASSEMBLY__ */ |
491 | 492 | ||
492 | #ifdef __ASSEMBLY__ | ||
493 | |||
494 | #define BEGIN_FTR_SECTION_NESTED(label) label: | ||
495 | #define BEGIN_FTR_SECTION BEGIN_FTR_SECTION_NESTED(97) | ||
496 | #define END_FTR_SECTION_NESTED(msk, val, label) \ | ||
497 | MAKE_FTR_SECTION_ENTRY(msk, val, label, __ftr_fixup) | ||
498 | #define END_FTR_SECTION(msk, val) \ | ||
499 | END_FTR_SECTION_NESTED(msk, val, 97) | ||
500 | |||
501 | #define END_FTR_SECTION_IFSET(msk) END_FTR_SECTION((msk), (msk)) | ||
502 | #define END_FTR_SECTION_IFCLR(msk) END_FTR_SECTION((msk), 0) | ||
503 | #endif /* __ASSEMBLY__ */ | ||
504 | |||
505 | #endif /* __KERNEL__ */ | 493 | #endif /* __KERNEL__ */ |
506 | #endif /* __ASM_POWERPC_CPUTABLE_H */ | 494 | #endif /* __ASM_POWERPC_CPUTABLE_H */ |