Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dce55470 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

[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: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 736f5633

arch/s390/kernel/process.c

+3 −3
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ 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,

	atomic_notifier_call_chain(&idle_chain, S390_CPU_NOT_IDLE,

				   (void *)(long) smp_processor_id());

}
@@ -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
Original line number Diff line number Diff line
@@ -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;

	}

arch/s390/kernel/vtime.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}

include/asm-s390/processor.h

+2 −2
Original line number Diff line number Diff line
@@ -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);