From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Tue, 10 Jul 2007 09:24:21 +0000 (+0200)
Subject: [S390] s390: rename CPU_IDLE to S390_CPU_IDLE
X-Git-Tag: v2.6.23-rc1~1155^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dce554708cdb02a1053ca3a68997b9facbfde5ce;p=pandora-kernel.git

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

Reading git-diff-tree failed