Messages in this thread Patch in this message | | | Date | Thu, 5 Jun 2014 12:09:05 +0200 | From | Ingo Molnar <> | Subject | Re: [PATCH v2 0/6] sched: expel confusing usage of the term "power" |
| |
So I'm hijacking this thread a bit to report a bug in the following patch:
Author: Daniel Lezcano <daniel.lezcano@linaro.org> Date: Tue Jun 3 14:59:05 2014 +0200
sched: Move enum CPU_[xxx_]IDLE to private sched.h
The different enum CPU_IDLE, CPU_NOT_IDLE, CPU_NEWLY_IDLE and CPU_MAX_IDLE_TYPES are only used in kernel/sched/fair.c and kernel/sched/stats.c.
on x86-64 defconfig it fails to build with:
In file included from /home/mingo/tip/arch/x86/kernel/asm-offsets.c:9:0: /home/mingo/tip/include/linux/sched.h:939:24: error: ‘CPU_MAX_IDLE_TYPES’ undeclared here (not in a function) unsigned int lb_count[CPU_MAX_IDLE_TYPES]; ^ make[2]: *** [arch/x86/kernel/asm-offsets.s] Error 1 make[1]: *** [prepare0] Error 2 make: *** [sub-make] Error 2
Find below the version that came to me.
Thanks,
Ingo
===========================> From 21e0efe63f6766fc9b685ca8d5744101f9a21270 Mon Sep 17 00:00:00 2001 From: Daniel Lezcano <daniel.lezcano@linaro.org> Date: Tue, 3 Jun 2014 14:59:05 +0200 Subject: [PATCH] sched: Move enum CPU_[xxx_]IDLE to private sched.h
The different enum CPU_IDLE, CPU_NOT_IDLE, CPU_NEWLY_IDLE and CPU_MAX_IDLE_TYPES are only used in kernel/sched/fair.c and kernel/sched/stats.c.
Move their definitions in the private 'sched.h' file located in the same place than the files above.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Signed-off-by: Peter Zijlstra <peterz@infradead.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Link: http://lkml.kernel.org/r/1401800345-29468-1-git-send-email-daniel.lezcano@linaro.org Signed-off-by: Ingo Molnar <mingo@kernel.org> --- include/linux/sched.h | 7 ------- kernel/sched/sched.h | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/include/linux/sched.h b/include/linux/sched.h index ce93768..b313c2e 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -846,13 +846,6 @@ static inline int sched_info_on(void) #endif } -enum cpu_idle_type { - CPU_IDLE, - CPU_NOT_IDLE, - CPU_NEWLY_IDLE, - CPU_MAX_IDLE_TYPES -}; - /* * Increase resolution of cpu_capacity calculations */ diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 956b8ca..9ab7d95 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -23,6 +23,13 @@ extern atomic_long_t calc_load_tasks; extern long calc_load_fold_active(struct rq *this_rq); extern void update_cpu_load_active(struct rq *this_rq); +enum cpu_idle_type { + CPU_IDLE, + CPU_NOT_IDLE, + CPU_NEWLY_IDLE, + CPU_MAX_IDLE_TYPES +}; + /* * Helpers for converting nanosecond timing to jiffy resolution */ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |