Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41eba0ad authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Paul Mackerras
Browse files

powerpc: Turn get/set_hard_smp_proccessor_id into inlines 



They don't need to be macros, and having them as inline functions
avoids warnings about unused variables on some configurations when the
argument isn't evaluated.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent f3d3d307

arch/powerpc/include/asm/smp.h

+29 −10
Original line number Original line Diff line number Diff line
@@ -56,9 +56,16 @@ extern int smp_hw_index[]; 




#define raw_smp_processor_id()	(current_thread_info()->cpu)

#define raw_smp_processor_id()	(current_thread_info()->cpu)

#define hard_smp_processor_id() 	(smp_hw_index[smp_processor_id()])

#define hard_smp_processor_id() 	(smp_hw_index[smp_processor_id()])

#define get_hard_smp_processor_id(cpu)	(smp_hw_index[(cpu)])



#define set_hard_smp_processor_id(cpu, phys)\

static inline int get_hard_smp_processor_id(int cpu)

					(smp_hw_index[(cpu)] = (phys))

{

	return smp_hw_index[cpu];

}



static inline void set_hard_smp_processor_id(int cpu, int phys)

{

	smp_hw_index[cpu] = phys;

}

#endif

#endif





DECLARE_PER_CPU(cpumask_t, cpu_sibling_map);

DECLARE_PER_CPU(cpumask_t, cpu_sibling_map);
@@ -92,9 +99,15 @@ extern void __cpu_die(unsigned int cpu); 
#endif /* CONFIG_SMP */

#endif /* CONFIG_SMP */





#ifdef CONFIG_PPC64

#ifdef CONFIG_PPC64

#define get_hard_smp_processor_id(CPU) (paca[(CPU)].hw_cpu_id)

static inline int get_hard_smp_processor_id(int cpu)

#define set_hard_smp_processor_id(CPU, VAL) \

{

	do { (paca[(CPU)].hw_cpu_id = (VAL)); } while (0)

	return paca[cpu].hw_cpu_id;

}



static inline void set_hard_smp_processor_id(int cpu, int phys)

{

	paca[cpu].hw_cpu_id = phys;

}





extern void smp_release_cpus(void);

extern void smp_release_cpus(void);
@@ -102,10 +115,16 @@ extern void smp_release_cpus(void); 
/* 32-bit */

/* 32-bit */

#ifndef CONFIG_SMP

#ifndef CONFIG_SMP

extern int boot_cpuid_phys;

extern int boot_cpuid_phys;

#define get_hard_smp_processor_id(cpu) 	boot_cpuid_phys

static inline int get_hard_smp_processor_id(int cpu)

#define set_hard_smp_processor_id(cpu, phys)

{

#endif

	return boot_cpuid_phys;

#endif

}



static inline void set_hard_smp_processor_id(int cpu, int phys)

{

}

#endif /* !CONFIG_SMP */

#endif /* !CONFIG_PPC64 */





extern int smt_enabled_at_boot;

extern int smt_enabled_at_boot;