From: Jiajun Chen <chenjiajun8(a)huawei.com>
euleros inclusion
category: bugfix
bugzilla: NA
CVE: NA
---------------------------
while CONFIG_CPU_IDLE is disabled, the haltpoll_switch_governor function
should not return int type result,which will cause build err.
Fixes: 97c227885e0a ("cpuidle: fix container_of err in cpuidle_device and cpuidle_driver")
Signed-off-by: Jiajun Chen <chenjiajun8(a)huawei.com>
Reviewed-by: Keqian Zhu <zhukeqian1(a)huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang(a)huawei.com>
---
include/linux/cpuidle.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
index e365f5dfe6e7d..9dd5a6b27b212 100644
--- a/include/linux/cpuidle.h
+++ b/include/linux/cpuidle.h
@@ -200,8 +200,7 @@ static inline u64 cpuidle_haltpoll_time(struct cpuidle_driver *drv,
{return 0; }
static inline int cpuidle_register_driver(struct cpuidle_driver *drv)
{return -ENODEV; }
-static inline void haltpoll_switch_governor(struct cpuidle_driver *drv)
-{return -ENODEV; }
+static inline void haltpoll_switch_governor(struct cpuidle_driver *drv) { }
static inline struct cpuidle_driver *cpuidle_get_driver(void) {return NULL; }
static inline struct cpuidle_driver *cpuidle_driver_ref(void) {return NULL; }
static inline void cpuidle_driver_unref(void) {}
--
2.25.1