[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>
This commit is contained in:
committed by
Martin Schwidefsky
parent
736f563373
commit
dce554708c
@@ -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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user