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

Commit 321a8e9d authored by Mike Travis's avatar Mike Travis Committed by Ingo Molnar
Browse files

cpumask: add CPU_MASK_ALL_PTR macro 



  * Add a static cpumask_t variable "CPU_MASK_ALL_PTR" to use as
    a pointer reference to CPU_MASK_ALL.  This reduces where possible
    the instances where CPU_MASK_ALL allocates and fills a large
    array on the stack.  Used only if NR_CPUS > BITS_PER_LONG.

  * Change init/main.c to use new set_cpus_allowed_ptr().

Depends on:
	[sched-devel]: sched: add new set_cpus_allowed_ptr function

Cc: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarMike Travis <travis@sgi.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 7c16ec58

include/linux/cpumask.h

+6 −0
Original line number Original line Diff line number Diff line
@@ -243,6 +243,8 @@ int __next_cpu(int n, const cpumask_t *srcp); 
	[BITS_TO_LONGS(NR_CPUS)-1] = CPU_MASK_LAST_WORD			\

	[BITS_TO_LONGS(NR_CPUS)-1] = CPU_MASK_LAST_WORD			\

} }

} }





#define CPU_MASK_ALL_PTR	(&CPU_MASK_ALL)



#else

#else





#define CPU_MASK_ALL							\

#define CPU_MASK_ALL							\
@@ -251,6 +253,10 @@ int __next_cpu(int n, const cpumask_t *srcp); 
	[BITS_TO_LONGS(NR_CPUS)-1] = CPU_MASK_LAST_WORD			\

	[BITS_TO_LONGS(NR_CPUS)-1] = CPU_MASK_LAST_WORD			\

} }

} }





/* cpu_mask_all is in init/main.c */

extern cpumask_t cpu_mask_all;

#define CPU_MASK_ALL_PTR	(&cpu_mask_all)



#endif

#endif





#define CPU_MASK_NONE							\

#define CPU_MASK_NONE							\

init/main.c

+6 −1
Original line number Original line Diff line number Diff line
@@ -363,6 +363,11 @@ static inline void smp_prepare_cpus(unsigned int maxcpus) { } 




#else

#else





#if NR_CPUS > BITS_PER_LONG

cpumask_t cpu_mask_all __read_mostly = CPU_MASK_ALL;

EXPORT_SYMBOL(cpu_mask_all);

#endif



#ifndef CONFIG_HAVE_SETUP_PER_CPU_AREA

#ifndef CONFIG_HAVE_SETUP_PER_CPU_AREA

unsigned long __per_cpu_offset[NR_CPUS] __read_mostly;

unsigned long __per_cpu_offset[NR_CPUS] __read_mostly;
@@ -811,7 +816,7 @@ static int __init kernel_init(void * unused) 
	/*

	/*

	 * init can run on any cpu.

	 * init can run on any cpu.

	 */

	 */

	set_cpus_allowed(current, CPU_MASK_ALL);

	set_cpus_allowed_ptr(current, CPU_MASK_ALL_PTR);

	/*

	/*

	 * Tell the world that we're going to be the grim

	 * Tell the world that we're going to be the grim

	 * reaper of innocent orphaned children.

	 * reaper of innocent orphaned children.