Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

Michael Ellerman and committed by
Paul Mackerras
d0160bf0 2f25194d

+9 -7
+3 -1
arch/powerpc/kernel/firmware.c
··· 14 14 */ 15 15 16 16 #include <linux/config.h> 17 + #include <linux/module.h> 17 18 18 19 #include <asm/firmware.h> 19 20 20 - unsigned long ppc64_firmware_features; 21 + unsigned long powerpc_firmware_features; 22 + EXPORT_SYMBOL_GPL(powerpc_firmware_features);
+2 -2
arch/powerpc/platforms/iseries/setup.c
··· 680 680 if (PLATFORM_ISERIES_LPAR != platform) 681 681 return 0; 682 682 683 - ppc64_firmware_features |= FW_FEATURE_ISERIES; 684 - ppc64_firmware_features |= FW_FEATURE_LPAR; 683 + powerpc_firmware_features |= FW_FEATURE_ISERIES; 684 + powerpc_firmware_features |= FW_FEATURE_LPAR; 685 685 686 686 return 1; 687 687 }
+1 -1
arch/powerpc/platforms/pseries/firmware.c
··· 91 91 continue; 92 92 93 93 /* we have a match */ 94 - ppc64_firmware_features |= 94 + powerpc_firmware_features |= 95 95 firmware_features_table[i].val; 96 96 break; 97 97 }
+1 -1
arch/powerpc/platforms/pseries/setup.c
··· 385 385 */ 386 386 387 387 if (platform == PLATFORM_PSERIES_LPAR) 388 - ppc64_firmware_features |= FW_FEATURE_LPAR; 388 + powerpc_firmware_features |= FW_FEATURE_LPAR; 389 389 390 390 return 1; 391 391 }
+2 -2
include/asm-powerpc/firmware.h
··· 82 82 /* This is used to identify firmware features which are available 83 83 * to the kernel. 84 84 */ 85 - extern unsigned long ppc64_firmware_features; 85 + extern unsigned long powerpc_firmware_features; 86 86 87 87 #define firmware_has_feature(feature) \ 88 88 ((FW_FEATURE_ALWAYS & (feature)) || \ 89 - (FW_FEATURE_POSSIBLE & ppc64_firmware_features & (feature))) 89 + (FW_FEATURE_POSSIBLE & powerpc_firmware_features & (feature))) 90 90 91 91 extern void system_reset_fwnmi(void); 92 92 extern void machine_check_fwnmi(void);