powerpc/smp: Remove get_physical_package_id (e29e9ed6) · Commits · 戴 / test

arch/powerpc/include/asm/topology.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -114,12 +114,7 @@ static inline int cpu_to_coregroup_id(int cpu)
		#ifdef CONFIG_PPC64
		#include <asm/smp.h>

		#ifdef CONFIG_PPC_SPLPAR
		int get_physical_package_id(int cpu);
		#define topology_physical_package_id(cpu) (get_physical_package_id(cpu))
		#else
		#define topology_physical_package_id(cpu) (cpu_to_chip_id(cpu))
		#endif

		#define topology_sibling_cpumask(cpu) (per_cpu(cpu_sibling_map, cpu))
		#define topology_core_cpumask(cpu) (cpu_cpu_mask(cpu))

+0 −20

Original line number	Diff line number	Diff line
		@@ -1292,26 +1292,6 @@ static inline void add_cpu_to_smallcore_masks(int cpu)
		}
		}

		int get_physical_package_id(int cpu)
		{
		int pkg_id = cpu_to_chip_id(cpu);

		/*
		* If the platform is PowerNV or Guest on KVM, ibm,chip-id is
		* defined. Hence we would return the chip-id as the result of
		* get_physical_package_id.
		*/
		if (pkg_id == -1 && firmware_has_feature(FW_FEATURE_LPAR) &&
		IS_ENABLED(CONFIG_PPC_SPLPAR)) {
		struct device_node *np = of_get_cpu_node(cpu, NULL);
		pkg_id = of_node_to_nid(np);
		of_node_put(np);
		}

		return pkg_id;
		}
		EXPORT_SYMBOL_GPL(get_physical_package_id);

		static void add_cpu_to_masks(int cpu)
		{
		int first_thread = cpu_first_thread_sibling(cpu);