Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aba6efc4 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Memory hotplug: Move alternative function definitions to header 



Move the definitions of offline_pages() and remove_memory()
for CONFIG_MEMORY_HOTREMOVE to memory_hotplug.h, where they belong,
and make them static inline.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 173a5a4c

include/linux/memory_hotplug.h

+9 −0
Original line number Diff line number Diff line
@@ -234,6 +234,8 @@ static inline void unlock_memory_hotplug(void) {} 


extern int is_mem_section_removable(unsigned long pfn, unsigned long nr_pages);

extern void try_offline_node(int nid);

extern int offline_pages(unsigned long start_pfn, unsigned long nr_pages);

extern void remove_memory(int nid, u64 start, u64 size);



#else

static inline int is_mem_section_removable(unsigned long pfn,
@@ -243,6 +245,13 @@ static inline int is_mem_section_removable(unsigned long pfn, 
}



static inline void try_offline_node(int nid) {}



static inline int offline_pages(unsigned long start_pfn, unsigned long nr_pages)

{

	return -EINVAL;

}



static inline void remove_memory(int nid, u64 start, u64 size) {}

#endif /* CONFIG_MEMORY_HOTREMOVE */



extern int walk_memory_range(unsigned long start_pfn, unsigned long end_pfn,

mm/memory_hotplug.c

+1 −7
Original line number Diff line number Diff line
@@ -1822,11 +1822,5 @@ void __ref remove_memory(int nid, u64 start, u64 size) 


	unlock_memory_hotplug();

}

#else

int offline_pages(unsigned long start_pfn, unsigned long nr_pages)

{

	return -EINVAL;

}

void remove_memory(int nid, u64 start, u64 size) {}

#endif /* CONFIG_MEMORY_HOTREMOVE */

EXPORT_SYMBOL_GPL(remove_memory);

#endif /* CONFIG_MEMORY_HOTREMOVE */