OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[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: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Michael Ellerman 2006-03-27 14:26:25 +11:00 committed by Paul Mackerras
parent 2f25194dbe
commit d0160bf0b3
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/kernel/firmware.c
View File

@ -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);

4
arch/powerpc/platforms/iseries/setup.c
View File

@ -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;
} }

2
arch/powerpc/platforms/pseries/firmware.c
View File

@ -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;
} }

2
arch/powerpc/platforms/pseries/setup.c
View File

@ -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;
} }

4
include/asm-powerpc/firmware.h
View File

@ -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);