From 73d51d3b84484307c554a91f6e1d3eded897dc09 Mon Sep 17 00:00:00 2001 From: Michael Ellerman Date: Mon, 27 Mar 2006 14:26:25 +1100 Subject: [PATCH] --- yaml --- r: 24639 b: refs/heads/master c: d0160bf0b3e87032be8e85f80ddd2f18e107b86f h: refs/heads/master i: 24637: 401465e10dd9f3fd76de5bb75d3717cacbb5cbf0 24635: a793b33e3fd3b7a05c3b85aea64d0d20ca774ec3 24631: 16f3281f5753c0cf7711f8aa26dc4f95ca55f3bb 24623: 63b464e66309ad5facf8e79ed71614c8c62c6a34 24607: ea489a4500306aab53d4a710cd970470faf233a8 24575: 9c716ca855cb7c4f56bde62a7b8bf5ba7306ece1 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/firmware.c | 4 +++- trunk/arch/powerpc/platforms/iseries/setup.c | 4 ++-- trunk/arch/powerpc/platforms/pseries/firmware.c | 2 +- trunk/arch/powerpc/platforms/pseries/setup.c | 2 +- trunk/include/asm-powerpc/firmware.h | 4 ++-- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 4f022f350e44..aea72301dd54 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f25194dbe0c4b2472ce133ea3e9bcbb14936ae7 +refs/heads/master: d0160bf0b3e87032be8e85f80ddd2f18e107b86f diff --git a/trunk/arch/powerpc/kernel/firmware.c b/trunk/arch/powerpc/kernel/firmware.c index 4d37a3cb80f6..0bfe9061720a 100644 --- a/trunk/arch/powerpc/kernel/firmware.c +++ b/trunk/arch/powerpc/kernel/firmware.c @@ -14,7 +14,9 @@ */ #include +#include #include -unsigned long ppc64_firmware_features; +unsigned long powerpc_firmware_features; +EXPORT_SYMBOL_GPL(powerpc_firmware_features); diff --git a/trunk/arch/powerpc/platforms/iseries/setup.c b/trunk/arch/powerpc/platforms/iseries/setup.c index fa4550611c11..155aa690e4bb 100644 --- a/trunk/arch/powerpc/platforms/iseries/setup.c +++ b/trunk/arch/powerpc/platforms/iseries/setup.c @@ -680,8 +680,8 @@ static int __init iseries_probe(int platform) if (PLATFORM_ISERIES_LPAR != platform) return 0; - ppc64_firmware_features |= FW_FEATURE_ISERIES; - ppc64_firmware_features |= FW_FEATURE_LPAR; + powerpc_firmware_features |= FW_FEATURE_ISERIES; + powerpc_firmware_features |= FW_FEATURE_LPAR; return 1; } diff --git a/trunk/arch/powerpc/platforms/pseries/firmware.c b/trunk/arch/powerpc/platforms/pseries/firmware.c index 989f4bc136cb..c01d8f0cbe6d 100644 --- a/trunk/arch/powerpc/platforms/pseries/firmware.c +++ b/trunk/arch/powerpc/platforms/pseries/firmware.c @@ -91,7 +91,7 @@ void __init fw_feature_init(void) continue; /* we have a match */ - ppc64_firmware_features |= + powerpc_firmware_features |= firmware_features_table[i].val; break; } diff --git a/trunk/arch/powerpc/platforms/pseries/setup.c b/trunk/arch/powerpc/platforms/pseries/setup.c index 213bf983242f..f736234db9b2 100644 --- a/trunk/arch/powerpc/platforms/pseries/setup.c +++ b/trunk/arch/powerpc/platforms/pseries/setup.c @@ -385,7 +385,7 @@ static int __init pSeries_probe(int platform) */ if (platform == PLATFORM_PSERIES_LPAR) - ppc64_firmware_features |= FW_FEATURE_LPAR; + powerpc_firmware_features |= FW_FEATURE_LPAR; return 1; } diff --git a/trunk/include/asm-powerpc/firmware.h b/trunk/include/asm-powerpc/firmware.h index 03c2fdff021b..77069df92bf8 100644 --- a/trunk/include/asm-powerpc/firmware.h +++ b/trunk/include/asm-powerpc/firmware.h @@ -82,11 +82,11 @@ enum { /* This is used to identify firmware features which are available * to the kernel. */ -extern unsigned long ppc64_firmware_features; +extern unsigned long powerpc_firmware_features; #define firmware_has_feature(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 machine_check_fwnmi(void);