Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0160bf0 authored by Michael Ellerman's avatar Michael Ellerman Committed by Paul Mackerras
Browse files

[PATCH] powerpc: Rename and export ppc64_firmware_features 



We need to export ppc64_firmware_features for modules. Before we do that
I think we should probably rename it to powerpc_firmware_features.

Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 2f25194d

arch/powerpc/kernel/firmware.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,9 @@ 
 */

 */





#include <linux/config.h>

#include <linux/config.h>

#include <linux/module.h>





#include <asm/firmware.h>

#include <asm/firmware.h>





unsigned long ppc64_firmware_features;
 
unsigned long powerpc_firmware_features;

EXPORT_SYMBOL_GPL(powerpc_firmware_features);

arch/powerpc/platforms/iseries/setup.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -680,8 +680,8 @@ static int __init iseries_probe(int platform) 
	if (PLATFORM_ISERIES_LPAR != platform)

	if (PLATFORM_ISERIES_LPAR != platform)

		return 0;

		return 0;





	ppc64_firmware_features |= FW_FEATURE_ISERIES;

	powerpc_firmware_features |= FW_FEATURE_ISERIES;

	ppc64_firmware_features |= FW_FEATURE_LPAR;

	powerpc_firmware_features |= FW_FEATURE_LPAR;





	return 1;

	return 1;

}

}

arch/powerpc/platforms/pseries/firmware.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -91,7 +91,7 @@ void __init fw_feature_init(void) 
				continue;

				continue;





			/* we have a match */

			/* we have a match */

			ppc64_firmware_features |=

			powerpc_firmware_features |=

				firmware_features_table[i].val;

				firmware_features_table[i].val;

			break;

			break;

		}

		}

arch/powerpc/platforms/pseries/setup.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -385,7 +385,7 @@ static int __init pSeries_probe(int platform) 
	 */

	 */





	if (platform == PLATFORM_PSERIES_LPAR)

	if (platform == PLATFORM_PSERIES_LPAR)

		ppc64_firmware_features |= FW_FEATURE_LPAR;

		powerpc_firmware_features |= FW_FEATURE_LPAR;





	return 1;

	return 1;

}

}

include/asm-powerpc/firmware.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -82,11 +82,11 @@ enum { 
/* This is used to identify firmware features which are available

/* This is used to identify firmware features which are available

 * to the kernel.

 * to the kernel.

 */

 */

extern unsigned long	ppc64_firmware_features;

extern unsigned long	powerpc_firmware_features;





#define firmware_has_feature(feature)					\

#define firmware_has_feature(feature)					\

	((FW_FEATURE_ALWAYS & (feature)) ||				\

	((FW_FEATURE_ALWAYS & (feature)) ||				\

		(FW_FEATURE_POSSIBLE & ppc64_firmware_features & (feature)))

		(FW_FEATURE_POSSIBLE & powerpc_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);