diff options
| author | Tony Lindgren <tony@atomide.com> | 2018-08-28 12:58:03 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2018-08-28 12:58:03 -0400 |
| commit | ea4d65f14f6aaa53e379b93c5544245ef081b3e7 (patch) | |
| tree | a15485f4f1cf547a52b31fa8e16e14b9579b7200 /include/linux/memory_hotplug.h | |
| parent | ce32d59ee2cd036f6e8a6ed17a06a0b0bec5c67c (diff) | |
| parent | 496f3347d834aec91c38b45d6249ed00f58ad233 (diff) | |
Merge branch 'perm-fix' into omap-for-v4.19/fixes-v2
Diffstat (limited to 'include/linux/memory_hotplug.h')
| -rw-r--r-- | include/linux/memory_hotplug.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h index 4e9828cda7a2..34a28227068d 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h | |||
| @@ -319,6 +319,7 @@ static inline int offline_pages(unsigned long start_pfn, unsigned long nr_pages) | |||
| 319 | static inline void remove_memory(int nid, u64 start, u64 size) {} | 319 | static inline void remove_memory(int nid, u64 start, u64 size) {} |
| 320 | #endif /* CONFIG_MEMORY_HOTREMOVE */ | 320 | #endif /* CONFIG_MEMORY_HOTREMOVE */ |
| 321 | 321 | ||
| 322 | extern void __ref free_area_init_core_hotplug(int nid); | ||
| 322 | extern int walk_memory_range(unsigned long start_pfn, unsigned long end_pfn, | 323 | extern int walk_memory_range(unsigned long start_pfn, unsigned long end_pfn, |
| 323 | void *arg, int (*func)(struct memory_block *, void *)); | 324 | void *arg, int (*func)(struct memory_block *, void *)); |
| 324 | extern int add_memory(int nid, u64 start, u64 size); | 325 | extern int add_memory(int nid, u64 start, u64 size); |