diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-02-09 01:18:14 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-02-09 01:18:14 +0100 |
| commit | 56c7303e62996fc7b49aea1fd967ccdf94f3a5d9 (patch) | |
| tree | 9e5ff563595eb3d5d274a293d87fb811d168e762 /include/linux/memory_hotplug.h | |
| parent | 6e978b22efa1db9f6e71b24440b5f1d93e968ee3 (diff) | |
| parent | 565ebe8073f84ced436a18e76a5ba8e6bb73dfb3 (diff) | |
Merge back earlier cpufreq changes for v4.11.
Diffstat (limited to 'include/linux/memory_hotplug.h')
| -rw-r--r-- | include/linux/memory_hotplug.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h index 01033fadea47..c1784c0b4f35 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h @@ -284,7 +284,7 @@ extern void sparse_remove_one_section(struct zone *zone, struct mem_section *ms, unsigned long map_offset); extern struct page *sparse_decode_mem_map(unsigned long coded_mem_map, unsigned long pnum); -extern int zone_can_shift(unsigned long pfn, unsigned long nr_pages, - enum zone_type target); +extern bool zone_can_shift(unsigned long pfn, unsigned long nr_pages, + enum zone_type target, int *zone_shift); #endif /* __LINUX_MEMORY_HOTPLUG_H */ |