git.ipfire.org Git - thirdparty/linux.git/commit

author	Heiko Carstens <heiko.carstens@de.ibm.com>
	Tue, 10 Jul 2007 09:24:21 +0000 (11:24 +0200)
committer	Martin Schwidefsky <schwidefsky@de.ibm.com>
	Tue, 10 Jul 2007 09:24:53 +0000 (11:24 +0200)
commit	dce554708cdb02a1053ca3a68997b9facbfde5ce
tree	35b990796a2a2ec9f4eca14c85af71d94b5a4999	tree
parent	736f563373804e75f9f3b4abb9e480451bfef8d3	commit \| 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>

arch/s390/kernel/process.c		diff \| blob \| blame \| history
arch/s390/kernel/time.c		diff \| blob \| blame \| history
arch/s390/kernel/vtime.c		diff \| blob \| blame \| history
include/asm-s390/processor.h		diff \| blob \| blame \| history