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 /include | |
| parent | [S390] cio: Remove prototype for non-existing function cmf_reset(). (diff) | |
| download | linux-dev-dce554708cdb02a1053ca3a68997b9facbfde5ce.tar.xz linux-dev-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 'include')
| -rw-r--r-- | include/asm-s390/processor.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-s390/processor.h b/include/asm-s390/processor.h index 5cb480af65d5..3b972d4c6b29 100644 --- a/include/asm-s390/processor.h +++ b/include/asm-s390/processor.h @@ -357,8 +357,8 @@ extern void (*s390_base_ext_handler_fn)(void); /* * CPU idle notifier chain. */ -#define CPU_IDLE 0 -#define CPU_NOT_IDLE 1 +#define S390_CPU_IDLE 0 +#define S390_CPU_NOT_IDLE 1 struct notifier_block; int register_idle_notifier(struct notifier_block *nb); |