diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-01 22:24:07 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-01 22:24:07 +0200 |
| commit | aba6efc47133af4941cda16e690f71b7ad894da2 (patch) | |
| tree | 52c4863acd636118320fe2a47bf2f2d3c5b2a930 /mm/memory_hotplug.c | |
| parent | ACPI / processor: Fix potential NULL pointer dereference in acpi_processor_add() (diff) | |
| download | linux-aba6efc47133af4941cda16e690f71b7ad894da2.tar.xz linux-aba6efc47133af4941cda16e690f71b7ad894da2.zip | |
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: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'mm/memory_hotplug.c')
| -rw-r--r-- | mm/memory_hotplug.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 7026fbc42aaa..490e3d401e2c 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -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 */ |