diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2007-07-10 11:24:21 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2007-07-10 11:24:53 +0200 |
| commit | dce554708cdb02a1053ca3a68997b9facbfde5ce (patch) | |
| tree | 35b990796a2a2ec9f4eca14c85af71d94b5a4999 /arch/s390/kernel/vtime.c | |
| parent | 736f563373804e75f9f3b4abb9e480451bfef8d3 (diff) | |
| download | talos-obmc-linux-dce554708cdb02a1053ca3a68997b9facbfde5ce.tar.gz talos-obmc-linux-dce554708cdb02a1053ca3a68997b9facbfde5ce.zip | |
[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>
Diffstat (limited to 'arch/s390/kernel/vtime.c')
| -rw-r--r-- | arch/s390/kernel/vtime.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c index 1e1a6ee2cac1..b6ed143e8597 100644 --- a/arch/s390/kernel/vtime.c +++ b/arch/s390/kernel/vtime.c @@ -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; } |
