[PATCH] powerpc: Change firmware_has_feature() to a macro
So that we can use firmware_has_feature() in a BUG_ON() and have the compiler elide the code entirely if the feature can never be set, change firmware_has_feature to a macro. Unfortunate, but necessary at least until GCC bug #26724 is fixed. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
e3f94b85f9
commit
dd4d7bfad6
|
@ -84,11 +84,9 @@ enum {
|
||||||
*/
|
*/
|
||||||
extern unsigned long ppc64_firmware_features;
|
extern unsigned long ppc64_firmware_features;
|
||||||
|
|
||||||
static inline unsigned long firmware_has_feature(unsigned long feature)
|
#define firmware_has_feature(feature) \
|
||||||
{
|
((FW_FEATURE_ALWAYS & (feature)) || \
|
||||||
return (FW_FEATURE_ALWAYS & feature) ||
|
(FW_FEATURE_POSSIBLE & ppc64_firmware_features & (feature)))
|
||||||
(FW_FEATURE_POSSIBLE & ppc64_firmware_features & feature);
|
|
||||||
}
|
|
||||||
|
|
||||||
extern void system_reset_fwnmi(void);
|
extern void system_reset_fwnmi(void);
|
||||||
extern void machine_check_fwnmi(void);
|
extern void machine_check_fwnmi(void);
|
||||||
|
|
Reference in New Issue