lkml.org 
[lkml]   [2008]   [Sep]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH 12/31] cpumask: remove CPU_MASK_ALL_PTR
Signed-of-by: Mike Travis <travis@sgi.com>
---
arch/x86/kernel/cpu/mcheck/mce_amd_64.c | 4 ++--
include/asm-generic/topology.h | 2 +-
init/main.c | 2 +-
kernel/kmod.c | 2 +-
kernel/kthread.c | 4 ++--
kernel/sched.c | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
--- struct-cpumasks.orig/arch/x86/kernel/cpu/mcheck/mce_amd_64.c
+++ struct-cpumasks/arch/x86/kernel/cpu/mcheck/mce_amd_64.c
@@ -512,9 +512,9 @@ static __cpuinit int threshold_create_ba
goto out_free;

#ifndef CONFIG_SMP
- b->cpus = CPU_MASK_ALL;
+ cpus_copy(b->cpus, CPU_MASK_ALL);
#else
- b->cpus = per_cpu(cpu_core_map, cpu);
+ cpus_copy(b->cpus, per_cpu(cpu_core_map, cpu));
#endif

per_cpu(threshold_banks, cpu)[bank] = b;
--- struct-cpumasks.orig/include/asm-generic/topology.h
+++ struct-cpumasks/include/asm-generic/topology.h
@@ -49,7 +49,7 @@

#ifndef pcibus_to_cpumask
#define pcibus_to_cpumask(bus) (pcibus_to_node(bus) == -1 ? \
- CPU_MASK_ALL : \
+ cpu_mask_all : \
node_to_cpumask(pcibus_to_node(bus)) \
)
#endif
--- struct-cpumasks.orig/init/main.c
+++ struct-cpumasks/init/main.c
@@ -937,7 +937,7 @@ static int __init kernel_init(void * unu
/*
* init can run on any cpu.
*/
- set_cpus_allowed(current, CPU_MASK_ALL_PTR);
+ set_cpus_allowed(current, cpu_mask_all);
/*
* Tell the world that we're going to be the grim
* reaper of innocent orphaned children.
--- struct-cpumasks.orig/kernel/kmod.c
+++ struct-cpumasks/kernel/kmod.c
@@ -166,7 +166,7 @@ static int ____call_usermodehelper(void
}

/* We can run anywhere, unlike our parent keventd(). */
- set_cpus_allowed(current, CPU_MASK_ALL_PTR);
+ set_cpus_allowed(current, cpu_mask_all);

/*
* Our parent is keventd, which runs with elevated scheduling priority.
--- struct-cpumasks.orig/kernel/kthread.c
+++ struct-cpumasks/kernel/kthread.c
@@ -107,7 +107,7 @@ static void create_kthread(struct kthrea
*/
sched_setscheduler(create->result, SCHED_NORMAL, &param);
set_user_nice(create->result, KTHREAD_NICE_LEVEL);
- set_cpus_allowed(create->result, CPU_MASK_ALL_PTR);
+ set_cpus_allowed(create->result, cpu_mask_all);
}
complete(&create->done);
}
@@ -238,7 +238,7 @@ int kthreadd(void *unused)
set_task_comm(tsk, "kthreadd");
ignore_signals(tsk);
set_user_nice(tsk, KTHREAD_NICE_LEVEL);
- set_cpus_allowed(tsk, CPU_MASK_ALL_PTR);
+ set_cpus_allowed(tsk, cpu_mask_all);

current->flags |= PF_NOFREEZE | PF_FREEZER_NOSIG;

--- struct-cpumasks.orig/kernel/sched.c
+++ struct-cpumasks/kernel/sched.c
@@ -6195,7 +6195,7 @@ static void move_task_off_dead_cpu(int d
*/
static void migrate_nr_uninterruptible(struct rq *rq_src)
{
- struct rq *rq_dest = cpu_rq(any_online_cpu(*CPU_MASK_ALL_PTR));
+ struct rq *rq_dest = cpu_rq(any_online_cpu(cpu_mask_all));
unsigned long flags;

local_irq_save(flags);
--


\
 
 \ /
  Last update: 2008-09-29 20:09    [from the cache]
©2003-2011 Jasper Spaans