linux-next: build failure after merge of the cpuidle tree

[Stephen Rothwell]

Hi Daniel,

After merging the cpuidle tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

In file included from drivers/cpuidle/cpuidle.c:23:0:
drivers/cpuidle/cpuidle.h:74:20: error: redefinition of 'cpuidle_state_is_coupled'
drivers/cpuidle/cpuidle.h:44:20: note: previous definition of 'cpuidle_state_is_coupled' was here
drivers/cpuidle/cpuidle.h:80:19: error: redefinition of 'cpuidle_enter_state_coupled'
drivers/cpuidle/cpuidle.h:50:19: note: previous definition of 'cpuidle_enter_state_coupled' was here
drivers/cpuidle/cpuidle.h:86:19: error: redefinition of 'cpuidle_coupled_register_device'
drivers/cpuidle/cpuidle.h:56:19: note: previous definition of 'cpuidle_coupled_register_device' was here
drivers/cpuidle/cpuidle.h:91:20: error: redefinition of 'cpuidle_coupled_unregister_device'
drivers/cpuidle/cpuidle.h:61:20: note: previous definition of 'cpuidle_coupled_unregister_device' was here
In file included from drivers/cpuidle/governor.c:15:0:
drivers/cpuidle/cpuidle.h:74:20: error: redefinition of 'cpuidle_state_is_coupled'
drivers/cpuidle/cpuidle.h:44:20: note: previous definition of 'cpuidle_state_is_coupled' was here
drivers/cpuidle/cpuidle.h:80:19: error: redefinition of 'cpuidle_enter_state_coupled'
drivers/cpuidle/cpuidle.h:50:19: note: previous definition of 'cpuidle_enter_state_coupled' was here
drivers/cpuidle/cpuidle.h:86:19: error: redefinition of 'cpuidle_coupled_register_device'
drivers/cpuidle/cpuidle.h:56:19: note: previous definition of 'cpuidle_coupled_register_device' was here
drivers/cpuidle/cpuidle.h:91:20: error: redefinition of 'cpuidle_coupled_unregister_device'
drivers/cpuidle/cpuidle.h:61:20: note: previous definition of 'cpuidle_coupled_unregister_device' was here

Caused by a mismerge.  I applied the following merge fix:

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Thu, 13 Dec 2012 11:52:10 +1100
Subject: [PATCH] cpuidle: fix mismerge

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 drivers/cpuidle/cpuidle.h |   30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/drivers/cpuidle/cpuidle.h b/drivers/cpuidle/cpuidle.h
index f67517e..ee97e96 100644
--- a/drivers/cpuidle/cpuidle.h
+++ b/drivers/cpuidle/cpuidle.h
@@ -63,34 +63,4 @@ static inline void cpuidle_coupled_unregister_device(struct cpuidle_device *dev)
 }
 #endif
 
-#ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED
-bool cpuidle_state_is_coupled(struct cpuidle_device *dev,
-		struct cpuidle_driver *drv, int state);
-int cpuidle_enter_state_coupled(struct cpuidle_device *dev,
-		struct cpuidle_driver *drv, int next_state);
-int cpuidle_coupled_register_device(struct cpuidle_device *dev);
-void cpuidle_coupled_unregister_device(struct cpuidle_device *dev);
-#else
-static inline bool cpuidle_state_is_coupled(struct cpuidle_device *dev,
-		struct cpuidle_driver *drv, int state)
-{
-	return false;
-}
-
-static inline int cpuidle_enter_state_coupled(struct cpuidle_device *dev,
-		struct cpuidle_driver *drv, int next_state)
-{
-	return -1;
-}
-
-static inline int cpuidle_coupled_register_device(struct cpuidle_device *dev)
-{
-	return 0;
-}
-
-static inline void cpuidle_coupled_unregister_device(struct cpuidle_device *dev)
-{
-}
-#endif
-
 #endif /* __DRIVER_CPUIDLE_H */
-- 
1.7.10.280.gaa39

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature