powerpc/pseries: Fix build of topology stuff without CONFIG_NUMA (5d7d8072) · Commits · e / devices / android_kernel_oneplus_sm7250

arch/powerpc/include/asm/topology.h

+14 −13

Original line number	Original line	Diff line number	Diff line
	@@ -93,19 +93,6 @@ extern void __init dump_numa_cpu_topology(void);
	extern int sysfs_add_device_to_node(struct sys_device *dev, int nid);		extern int sysfs_add_device_to_node(struct sys_device *dev, int nid);
	extern void sysfs_remove_device_from_node(struct sys_device *dev, int nid);		extern void sysfs_remove_device_from_node(struct sys_device *dev, int nid);

	#ifdef CONFIG_PPC_SPLPAR
	extern int start_topology_update(void);
	extern int stop_topology_update(void);
	#else
	static inline int start_topology_update(void)
	{
	return 0;
	}
	static inline int stop_topology_update(void)
	{
	return 0;
	}
	#endif /* CONFIG_PPC_SPLPAR */
	#else		#else

	static inline void dump_numa_cpu_topology(void) {}		static inline void dump_numa_cpu_topology(void) {}
	@@ -121,6 +108,20 @@ static inline void sysfs_remove_device_from_node(struct sys_device *dev,
	}		}
	#endif /* CONFIG_NUMA */		#endif /* CONFIG_NUMA */

			#if defined(CONFIG_NUMA) && defined(CONFIG_PPC_SPLPAR)
			extern int start_topology_update(void);
			extern int stop_topology_update(void);
			#else
			static inline int start_topology_update(void)
			{
			return 0;
			}
			static inline int stop_topology_update(void)
			{
			return 0;
			}
			#endif /* CONFIG_NUMA && CONFIG_PPC_SPLPAR */

	#include <asm-generic/topology.h>		#include <asm-generic/topology.h>

	#ifdef CONFIG_SMP		#ifdef CONFIG_SMP

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1296,7 +1296,6 @@ static u8 vphn_cpu_change_counts[NR_CPUS][VPHN_NR_CHANGE_CTRS];
	static cpumask_t cpu_associativity_changes_mask;		static cpumask_t cpu_associativity_changes_mask;
	static int vphn_enabled;		static int vphn_enabled;
	static void set_topology_timer(void);		static void set_topology_timer(void);
	int stop_topology_update(void);

	/*		/*
	* Store the current values of the associativity change counters in the		* Store the current values of the associativity change counters in the