1 From 41f31de242a3bb03740daff7770c4402efdddcf8 Mon Sep 17 00:00:00 2001
2 From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
3 Date: Wed, 13 Jan 2016 17:41:53 +0100
4 Subject: [PATCH 255/365] move update_migrate_disable() definition
6 so it is not within CONFIG_SMP, fixes build on SMP=n
8 Reported-by: kernel test robot <ying.huang@linux.intel.com>
9 Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
11 kernel/sched/core.c | 18 +++++++++---------
12 1 file changed, 9 insertions(+), 9 deletions(-)
14 diff --git a/kernel/sched/core.c b/kernel/sched/core.c
15 index 672dab3..88bfe2d 100644
16 --- a/kernel/sched/core.c
17 +++ b/kernel/sched/core.c
18 @@ -1096,6 +1096,15 @@ void check_preempt_curr(struct rq *rq, struct task_struct *p, int flags)
19 rq_clock_skip_update(rq, true);
22 +#if defined(CONFIG_PREEMPT_RT_FULL) && defined(CONFIG_SMP)
23 +#define MIGRATE_DISABLE_SET_AFFIN (1<<30) /* Can't make a negative */
24 +#define migrate_disabled_updated(p) ((p)->migrate_disable & MIGRATE_DISABLE_SET_AFFIN)
25 +#define migrate_disable_count(p) ((p)->migrate_disable & ~MIGRATE_DISABLE_SET_AFFIN)
27 +static inline void update_migrate_disable(struct task_struct *p) { }
28 +#define migrate_disabled_updated(p) 0
33 * This is how migration works:
34 @@ -1213,15 +1222,6 @@ void set_cpus_allowed_common(struct task_struct *p, const struct cpumask *new_ma
35 p->nr_cpus_allowed = cpumask_weight(new_mask);
38 -#if defined(CONFIG_PREEMPT_RT_FULL) && defined(CONFIG_SMP)
39 -#define MIGRATE_DISABLE_SET_AFFIN (1<<30) /* Can't make a negative */
40 -#define migrate_disabled_updated(p) ((p)->migrate_disable & MIGRATE_DISABLE_SET_AFFIN)
41 -#define migrate_disable_count(p) ((p)->migrate_disable & ~MIGRATE_DISABLE_SET_AFFIN)
43 -static inline void update_migrate_disable(struct task_struct *p) { }
44 -#define migrate_disabled_updated(p) 0
47 void do_set_cpus_allowed(struct task_struct *p, const struct cpumask *new_mask)
49 struct rq *rq = task_rq(p);