diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2007-07-10 05:24:21 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2007-07-10 05:24:53 -0400 |
commit | dce554708cdb02a1053ca3a68997b9facbfde5ce (patch) | |
tree | 35b990796a2a2ec9f4eca14c85af71d94b5a4999 | |
parent | 736f563373804e75f9f3b4abb9e480451bfef8d3 (diff) |
[S390] s390: rename CPU_IDLE to S390_CPU_IDLE
sched-cfs-v2.6.22-git-v18.patch introduces CPU_IDLE in sched.h.
This conflict 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.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r-- | arch/s390/kernel/process.c | 6 | ||||
-rw-r--r-- | arch/s390/kernel/time.c | 4 | ||||
-rw-r--r-- | arch/s390/kernel/vtime.c | 4 | ||||
-rw-r--r-- | include/asm-s390/processor.h | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c index eb43c3b31269..441975b796fb 100644 --- a/arch/s390/kernel/process.c +++ b/arch/s390/kernel/process.c | |||
@@ -93,8 +93,8 @@ void do_monitor_call(struct pt_regs *regs, long interruption_code) | |||
93 | /* disable monitor call class 0 */ | 93 | /* disable monitor call class 0 */ |
94 | __ctl_clear_bit(8, 15); | 94 | __ctl_clear_bit(8, 15); |
95 | 95 | ||
96 | atomic_notifier_call_chain(&idle_chain, CPU_NOT_IDLE, | 96 | atomic_notifier_call_chain(&idle_chain, S390_CPU_NOT_IDLE, |
97 | (void *)(long) smp_processor_id()); | 97 | (void *)(long) smp_processor_id()); |
98 | } | 98 | } |
99 | 99 | ||
100 | extern void s390_handle_mcck(void); | 100 | extern void s390_handle_mcck(void); |
@@ -115,7 +115,7 @@ static void default_idle(void) | |||
115 | } | 115 | } |
116 | 116 | ||
117 | rc = atomic_notifier_call_chain(&idle_chain, | 117 | rc = atomic_notifier_call_chain(&idle_chain, |
118 | CPU_IDLE, (void *)(long) cpu); | 118 | S390_CPU_IDLE, (void *)(long) cpu); |
119 | if (rc != NOTIFY_OK && rc != NOTIFY_DONE) | 119 | if (rc != NOTIFY_OK && rc != NOTIFY_DONE) |
120 | BUG(); | 120 | BUG(); |
121 | if (rc != NOTIFY_OK) { | 121 | if (rc != NOTIFY_OK) { |
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c index 9c2872a7cca7..48dae49bc1ec 100644 --- a/arch/s390/kernel/time.c +++ b/arch/s390/kernel/time.c | |||
@@ -226,10 +226,10 @@ static int nohz_idle_notify(struct notifier_block *self, | |||
226 | unsigned long action, void *hcpu) | 226 | unsigned long action, void *hcpu) |
227 | { | 227 | { |
228 | switch (action) { | 228 | switch (action) { |
229 | case CPU_IDLE: | 229 | case S390_CPU_IDLE: |
230 | stop_hz_timer(); | 230 | stop_hz_timer(); |
231 | break; | 231 | break; |
232 | case CPU_NOT_IDLE: | 232 | case S390_CPU_NOT_IDLE: |
233 | start_hz_timer(); | 233 | start_hz_timer(); |
234 | break; | 234 | break; |
235 | } | 235 | } |
diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c index 1e1a6ee2cac1..b6ed143e8597 100644 --- a/arch/s390/kernel/vtime.c +++ b/arch/s390/kernel/vtime.c | |||
@@ -545,10 +545,10 @@ static int vtimer_idle_notify(struct notifier_block *self, | |||
545 | unsigned long action, void *hcpu) | 545 | unsigned long action, void *hcpu) |
546 | { | 546 | { |
547 | switch (action) { | 547 | switch (action) { |
548 | case CPU_IDLE: | 548 | case S390_CPU_IDLE: |
549 | stop_cpu_timer(); | 549 | stop_cpu_timer(); |
550 | break; | 550 | break; |
551 | case CPU_NOT_IDLE: | 551 | case S390_CPU_NOT_IDLE: |
552 | start_cpu_timer(); | 552 | start_cpu_timer(); |
553 | break; | 553 | break; |
554 | } | 554 | } |
diff --git a/include/asm-s390/processor.h b/include/asm-s390/processor.h index 5cb480af65d5..3b972d4c6b29 100644 --- a/include/asm-s390/processor.h +++ b/include/asm-s390/processor.h | |||
@@ -357,8 +357,8 @@ extern void (*s390_base_ext_handler_fn)(void); | |||
357 | /* | 357 | /* |
358 | * CPU idle notifier chain. | 358 | * CPU idle notifier chain. |
359 | */ | 359 | */ |
360 | #define CPU_IDLE 0 | 360 | #define S390_CPU_IDLE 0 |
361 | #define CPU_NOT_IDLE 1 | 361 | #define S390_CPU_NOT_IDLE 1 |
362 | 362 | ||
363 | struct notifier_block; | 363 | struct notifier_block; |
364 | int register_idle_notifier(struct notifier_block *nb); | 364 | int register_idle_notifier(struct notifier_block *nb); |