[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>

diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
index eb43c3b31269c64fe7da6f04f8a99bc53c82d2b2..441975b796fb03d901cef8a63dc3414a3a2b508c 100644 (file)
--- 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)
        /* 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) {

diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c
index 9c2872a7cca723f163ec91783ebf85315883d8ed..48dae49bc1ec474ffe80f3eed427a610f48d48bf 100644 (file)
--- 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,
                            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;
        }

diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c
index 1e1a6ee2cac174b163aa8684eb70a92b5e64ff37..b6ed143e8597156d181437cab5519afe2062012d 100644 (file)
--- 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,
                              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;
        }

diff --git a/include/asm-s390/processor.h b/include/asm-s390/processor.h
index 5cb480af65d5513e8a55809218fcc79ce0645fd6..3b972d4c6b296f6d8cfb4b51f0f55608832dc134 100644 (file)
--- a/include/asm-s390/processor.h
+++ b/include/asm-s390/processor.h
@@ -357,8 +357,8 @@ extern void (*s390_base_ext_handler_fn)(void);
 /*
  * CPU idle notifier chain.
  */
-#define CPU_IDLE       0
-#define CPU_NOT_IDLE   1
+#define S390_CPU_IDLE          0
+#define S390_CPU_NOT_IDLE      1
 
 struct notifier_block;
 int register_idle_notifier(struct notifier_block *nb);