Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask: oprofile: Thou shalt not call __exit functions from __init functions cpumask: remove the now-obsoleted pcibus_to_cpumask(): generic cpumask: remove cpumask_t from core cpumask: convert rcutorture.c cpumask: use new cpumask_ functions in core code. cpumask: remove references to struct irqaction's mask field. cpumask: use mm_cpumask() wrapper: kernel/fork.c cpumask: use set_cpu_active in init/main.c cpumask: remove node_to_first_cpu cpumask: fix seq_bitmap_*() functions. cpumask: remove dangerous CPU_MASK_ALL_PTR, &CPU_MASK_ALL
This commit is contained in:
@@ -43,20 +43,10 @@
|
||||
#ifndef cpumask_of_node
|
||||
#define cpumask_of_node(node) ((void)node, cpu_online_mask)
|
||||
#endif
|
||||
#ifndef node_to_first_cpu
|
||||
#define node_to_first_cpu(node) ((void)(node),0)
|
||||
#endif
|
||||
#ifndef pcibus_to_node
|
||||
#define pcibus_to_node(bus) ((void)(bus), -1)
|
||||
#endif
|
||||
|
||||
#ifndef pcibus_to_cpumask
|
||||
#define pcibus_to_cpumask(bus) (pcibus_to_node(bus) == -1 ? \
|
||||
CPU_MASK_ALL : \
|
||||
node_to_cpumask(pcibus_to_node(bus)) \
|
||||
)
|
||||
#endif
|
||||
|
||||
#ifndef cpumask_of_pcibus
|
||||
#define cpumask_of_pcibus(bus) (pcibus_to_node(bus) == -1 ? \
|
||||
cpu_all_mask : \
|
||||
|
||||
@@ -90,12 +90,12 @@ static inline void cpuset_init_smp(void) {}
|
||||
static inline void cpuset_cpus_allowed(struct task_struct *p,
|
||||
struct cpumask *mask)
|
||||
{
|
||||
*mask = cpu_possible_map;
|
||||
cpumask_copy(mask, cpu_possible_mask);
|
||||
}
|
||||
static inline void cpuset_cpus_allowed_locked(struct task_struct *p,
|
||||
struct cpumask *mask)
|
||||
{
|
||||
*mask = cpu_possible_map;
|
||||
cpumask_copy(mask, cpu_possible_mask);
|
||||
}
|
||||
|
||||
static inline nodemask_t cpuset_mems_allowed(struct task_struct *p)
|
||||
|
||||
@@ -55,7 +55,7 @@ int seq_bitmap(struct seq_file *m, const unsigned long *bits,
|
||||
unsigned int nr_bits);
|
||||
static inline int seq_cpumask(struct seq_file *m, const struct cpumask *mask)
|
||||
{
|
||||
return seq_bitmap(m, mask->bits, nr_cpu_ids);
|
||||
return seq_bitmap(m, cpumask_bits(mask), nr_cpu_ids);
|
||||
}
|
||||
|
||||
static inline int seq_nodemask(struct seq_file *m, nodemask_t *mask)
|
||||
@@ -63,12 +63,13 @@ static inline int seq_nodemask(struct seq_file *m, nodemask_t *mask)
|
||||
return seq_bitmap(m, mask->bits, MAX_NUMNODES);
|
||||
}
|
||||
|
||||
int seq_bitmap_list(struct seq_file *m, unsigned long *bits,
|
||||
int seq_bitmap_list(struct seq_file *m, const unsigned long *bits,
|
||||
unsigned int nr_bits);
|
||||
|
||||
static inline int seq_cpumask_list(struct seq_file *m, cpumask_t *mask)
|
||||
static inline int seq_cpumask_list(struct seq_file *m,
|
||||
const struct cpumask *mask)
|
||||
{
|
||||
return seq_bitmap_list(m, mask->bits, NR_CPUS);
|
||||
return seq_bitmap_list(m, cpumask_bits(mask), nr_cpu_ids);
|
||||
}
|
||||
|
||||
static inline int seq_nodemask_list(struct seq_file *m, nodemask_t *mask)
|
||||
|
||||
Reference in New Issue
Block a user