sched: rename idle_type/SCHED_IDLE
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 24 lines · Linux Kernel Mailing List
Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=d15bcfdbe1818478891d714343f037cfe60875f0 Commit: d15bcfdbe1818478891d714343f037cfe60875f0 Parent: 7dcca30a32aadb0520417521b0c44f42d09fe05c Author: Ingo Molnar <[email protected]> AuthorDate: Mon Jul 9 18:51:57 2007 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Mon Jul 9 18:51:57 2007 +0200sched: rename idle_type/SCHED_IDLE
enum
idle_type(used by the load-balancer) clashes with theSCHED_IDLEname that we want to introduce. 'CPU_IDLE' instead of 'SCHED_IDLE' is more descriptive as well.include/linux/sched.h +0
-4@@ -639,12 +639,11 @@ static inline int sched_info_on(void)#endif } -enum idle_type -{ -SCHED_IDLE , -NOT_IDLE ,
include/linux/sched.h static inline int sched_info_on(void) · line 649
Quoted 10 lines
include/linux/sched.h +5
-2-NEWLY_IDLE , - MAX_IDLE_TYPES +enum cpu_idle_type { +CPU_IDLE , +CPU_NOT_IDLE , +CPU_NEWLY_IDLE , +CPU_MAX_IDLE_TYPES };/*
This broke s390:
GEN /tmp/tmp.qnrRZ13800/out/s390/Makefile CHK include/linux/version.h UPD include/linux/version.h CHK include/linux/utsrelease.h UPD include/linux/utsrelease.h
SYMLINK include/asm -> include/asm-s390
CC arch/s390/kernel/asm-offsets.s
In file included from /tmp/tmp.qnrRZ13800/kernel/arch/s390/kernel/asm-offsets.c:7:/tmp/tmp.qnrRZ13800/kernel/include/linux/sched.h:641: error: syntax error before numeric constant
make[2]: *** [arch/s390/kernel/asm-offsets.s] Error 1 make[1]: *** [prepare0] Error 2
make: *** [_all] Error 2
CLEAN .tmp_versions
Jan
Quoted 1 line · Jan Dittmer
This broke s390:
the patch below should fix this.
Ingo
--------------------->
Subject: [patch] s390: rename CPU_IDLE to S390_CPU_IDLE
From: Heiko Carstens <[email protected]>
CFS introduces CPU_IDLE in sched.h. This conflicts with the already existing define in include/asm-s390/processor.h.
Just rename the s390 defines, since they will go away as soon as we support CONFIG_NO_HZ instead of our own CONFIG_NO_IDLE_HZ.
--- arch/s390/kernel/process.c | 6 +++--- arch/s390/kernel/time.c | 4 ++-- arch/s390/kernel/vtime.c | 4 ++-- include/asm-s390/processor.h | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-)
arch/s390/kernel/process.c +3 -3
@@ -93,8 +93,8 @@ void do_monitor_call(struct pt_regs *reg/* disable monitor call class 0 */ __ctl_clear_bit (8 ,15 ); -atomic_notifier_call_chain (&idle_chain,CPU_NOT_IDLE , - (void *)(long )smp_processor_id ()); +atomic_notifier_call_chain (&idle_chain,S390_CPU_NOT_IDLE , + (void *)(long )smp_processor_id ()); }extern void s390_handle_mcck (void );
@@ -115,7 +115,7 @@ static void default_idle(void) } rc =atomic_notifier_call_chain (&idle_chain, -CPU_IDLE , (void *)(long ) cpu); +S390_CPU_IDLE , (void *)(long ) cpu);if (rc !=NOTIFY_OK && rc !=NOTIFY_DONE )BUG ();if (rc !=NOTIFY_OK ) {
arch/s390/kernel/time.c +2 -2
@@ -226,10 +226,10 @@ static int nohz_idle_notify(struct notif unsigned long action, void *hcpu) {switch (action) { -case CPU_IDLE : +case S390_CPU_IDLE :stop_hz_timer ();break ; -case CPU_NOT_IDLE : +case S390_CPU_NOT_IDLE :start_hz_timer ();break ; }
arch/s390/kernel/vtime.c +2 -2
@@ -545,10 +545,10 @@ static int vtimer_idle_notify(struct not unsigned long action, void *hcpu) {switch (action) { -case CPU_IDLE : +case S390_CPU_IDLE :stop_cpu_timer ();break ; -case CPU_NOT_IDLE : +case S390_CPU_NOT_IDLE :start_cpu_timer ();break ; }
include/asm-s390/processor.h +2 -2
@@ -357,8 +357,8 @@ extern void (*s390_base_ext_handler_fn)(/* * CPU idle notifier chain. */ -#define CPU_IDLE 0 -#define CPU_NOT_IDLE 1 +#define S390_CPU_IDLE 0 +#define S390_CPU_NOT_IDLE 1struct notifier_block ;int register_idle_notifier (struct notifier_block *nb);