[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>
This commit is contained in:
parent
736f563373
commit
dce554708c
4 changed files with 9 additions and 9 deletions
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue