[S390] s390: rename CPU_IDLE to S390_CPU_IDLE

Browse source

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:

Heiko Carstens 2007-07-10 11:24:21 +02:00 • committed by Martin Schwidefsky

parent 736f563373

commit dce554708c

4 changed files with 9 additions and 9 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

6

arch/s390/kernel/process.c

View file

4

arch/s390/kernel/time.c

View file

4

arch/s390/kernel/vtime.c

View file