diff options
| author | David S. Miller <davem@davemloft.net> | 2017-01-28 10:33:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-01-28 10:33:06 -0500 |
| commit | 4e8f2fc1a55d543717efb70e170b09e773d0542b (patch) | |
| tree | 30df1d7fc9dfa24fe2916711a17656682c3f7ec9 /include/linux/memory_hotplug.h | |
| parent | 158f323b9868b59967ad96957c4ca388161be321 (diff) | |
| parent | 1b1bc42c1692e9b62756323c675a44cb1a1f9dbd (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two trivial overlapping changes conflicts in MPLS and mlx5.
Signed-off-by: David S. Miller <davem@davemloft.net>
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, | |||
| 284 | unsigned long map_offset); | 284 | unsigned long map_offset); |
| 285 | extern struct page *sparse_decode_mem_map(unsigned long coded_mem_map, | 285 | extern struct page *sparse_decode_mem_map(unsigned long coded_mem_map, |
| 286 | unsigned long pnum); | 286 | unsigned long pnum); |
| 287 | extern int zone_can_shift(unsigned long pfn, unsigned long nr_pages, | 287 | extern bool zone_can_shift(unsigned long pfn, unsigned long nr_pages, |
| 288 | enum zone_type target); | 288 | enum zone_type target, int *zone_shift); |
| 289 | 289 | ||
| 290 | #endif /* __LINUX_MEMORY_HOTPLUG_H */ | 290 | #endif /* __LINUX_MEMORY_HOTPLUG_H */ |