From 596ecbc3b8c98841b0afc265b3392e13bbe6bdfd Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 30 Mar 2009 22:05:16 -0600 Subject: [PATCH] --- yaml --- r: 139087 b: refs/heads/master c: 612a726faf8486fa48b34fa37115ce1e7421d383 h: refs/heads/master i: 139085: 0d9b941ee9931dc5c072ae310a59e8e532358cfe 139083: 75a6fbdf14009075a9cf681c5f6cbab22736b669 139079: c19ee848e599d4f7869037a335d127824264a0e2 139071: 76b02535a2b817eff6fa34ce9951ff6730c3c82e v: v3 --- [refs] | 2 +- trunk/kernel/sched_cpupri.h | 2 +- trunk/kernel/stop_machine.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ea12308e8b69..7b9f10bea7f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 73d0a4b107d58908305f272bfae9bd17f74a2c81 +refs/heads/master: 612a726faf8486fa48b34fa37115ce1e7421d383 diff --git a/trunk/kernel/sched_cpupri.h b/trunk/kernel/sched_cpupri.h index 642a94ef8a0a..9a7e859b8fbf 100644 --- a/trunk/kernel/sched_cpupri.h +++ b/trunk/kernel/sched_cpupri.h @@ -25,7 +25,7 @@ struct cpupri { #ifdef CONFIG_SMP int cpupri_find(struct cpupri *cp, - struct task_struct *p, cpumask_t *lowest_mask); + struct task_struct *p, struct cpumask *lowest_mask); void cpupri_set(struct cpupri *cp, int cpu, int pri); int cpupri_init(struct cpupri *cp, bool bootmem); void cpupri_cleanup(struct cpupri *cp); diff --git a/trunk/kernel/stop_machine.c b/trunk/kernel/stop_machine.c index 74541ca49536..912823e2a11b 100644 --- a/trunk/kernel/stop_machine.c +++ b/trunk/kernel/stop_machine.c @@ -44,7 +44,7 @@ static DEFINE_MUTEX(setup_lock); static int refcount; static struct workqueue_struct *stop_machine_wq; static struct stop_machine_data active, idle; -static const cpumask_t *active_cpus; +static const struct cpumask *active_cpus; static void *stop_machine_work; static void set_state(enum stopmachine_state newstate)