diff options
| author |   Stephen Rothwell <sfr@canb.auug.org.au> | 2019-07-31 15:29:52 +1000 |
|---|---|---|
| committer |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-07-31 12:21:48 +0200 |
| commit | 7dcddef6f769d7e60691c732eb6d09cdb1d9df76 (patch) | |
| tree | c4335e9c5408c919977829cf4c28b6cf6739e027 /include/linux/cpuidle.h | |
| parent | cpuidle-haltpoll: disable host side polling when kvm virtualized (diff) | |
| download | linux-dev-7dcddef6f769d7e60691c732eb6d09cdb1d9df76.tar.xz linux-dev-7dcddef6f769d7e60691c732eb6d09cdb1d9df76.zip | |
cpuidle: header file stubs must be "static inline"
An x86_64 allmodconfig build produces these errors:
x86_64-linux-gnu-ld: kernel/sched/core.o: in function `cpuidle_poll_time':
core.c:(.text+0x230): multiple definition of `cpuidle_poll_time'; arch/x86/=
kernel/process.o:process.c:(.text+0xc0): first defined here
(and more)
Fixes: 259231a04561 ("cpuidle: add poll_limit_ns to cpuidle_device structure")
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'include/linux/cpuidle.h')
| -rw-r--r-- | include/linux/cpuidle.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index ba535a1a47d5..1a9f54eb3aa1 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h @@ -170,7 +170,7 @@ static inline int cpuidle_enter(struct cpuidle_driver *drv, struct cpuidle_device *dev, int index) {return -ENODEV; } static inline void cpuidle_reflect(struct cpuidle_device *dev, int index) { } -extern u64 cpuidle_poll_time(struct cpuidle_driver *drv, +static inline u64 cpuidle_poll_time(struct cpuidle_driver *drv, struct cpuidle_device *dev) {return 0; } static inline int cpuidle_register_driver(struct cpuidle_driver *drv) |