diff options
| author | Radim Krčmář <rkrcmar@redhat.com> | 2016-06-02 11:28:04 -0400 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2016-06-02 11:28:04 -0400 |
| commit | 13e98fd1efc7f65cab1bba6cfab7859840f9aa66 (patch) | |
| tree | 88be4e84a1c257e7e999d7bd344c511c66e7973e /include/linux/memory_hotplug.h | |
| parent | e28e909c36bb5d6319953822d84df00fce7cbd18 (diff) | |
| parent | 05fb05a6ca25e02ad8c31bc440b3c4996864f379 (diff) | |
Merge tag 'kvm-arm-for-v4.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm
KVM/ARM Fixes for v4.7-rc2
Fixes for the vgic, 2 of the patches address a bug introduced in v4.6
while the rest are for the new vgic.
Diffstat (limited to 'include/linux/memory_hotplug.h')
| -rw-r--r-- | include/linux/memory_hotplug.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h index 20d8a5d4d133..5145620ba48a 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h | |||
| @@ -182,7 +182,7 @@ static inline void arch_refresh_nodedata(int nid, pg_data_t *pgdat) | |||
| 182 | #endif /* CONFIG_HAVE_ARCH_NODEDATA_EXTENSION */ | 182 | #endif /* CONFIG_HAVE_ARCH_NODEDATA_EXTENSION */ |
| 183 | 183 | ||
| 184 | #ifdef CONFIG_HAVE_BOOTMEM_INFO_NODE | 184 | #ifdef CONFIG_HAVE_BOOTMEM_INFO_NODE |
| 185 | extern void register_page_bootmem_info_node(struct pglist_data *pgdat); | 185 | extern void __init register_page_bootmem_info_node(struct pglist_data *pgdat); |
| 186 | #else | 186 | #else |
| 187 | static inline void register_page_bootmem_info_node(struct pglist_data *pgdat) | 187 | static inline void register_page_bootmem_info_node(struct pglist_data *pgdat) |
| 188 | { | 188 | { |