diff options
Diffstat (limited to 'arch/powerpc/mm')
-rw-r--r-- | arch/powerpc/mm/mem.c | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index 93a5c53e3423..be5c506779a7 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c | |||
@@ -129,6 +129,39 @@ int __devinit arch_add_memory(int nid, u64 start, u64 size) | |||
129 | return __add_pages(zone, start_pfn, nr_pages); | 129 | return __add_pages(zone, start_pfn, nr_pages); |
130 | } | 130 | } |
131 | 131 | ||
132 | #ifdef CONFIG_MEMORY_HOTREMOVE | ||
133 | int remove_memory(u64 start, u64 size) | ||
134 | { | ||
135 | unsigned long start_pfn, end_pfn; | ||
136 | int ret; | ||
137 | |||
138 | start_pfn = start >> PAGE_SHIFT; | ||
139 | end_pfn = start_pfn + (size >> PAGE_SHIFT); | ||
140 | ret = offline_pages(start_pfn, end_pfn, 120 * HZ); | ||
141 | if (ret) | ||
142 | goto out; | ||
143 | /* Arch-specific calls go here - next patch */ | ||
144 | out: | ||
145 | return ret; | ||
146 | } | ||
147 | #endif /* CONFIG_MEMORY_HOTREMOVE */ | ||
148 | |||
149 | /* | ||
150 | * walk_memory_resource() needs to make sure there is no holes in a given | ||
151 | * memory range. On PPC64, since this range comes from /sysfs, the range | ||
152 | * is guaranteed to be valid, non-overlapping and can not contain any | ||
153 | * holes. By the time we get here (memory add or remove), /proc/device-tree | ||
154 | * is updated and correct. Only reason we need to check against device-tree | ||
155 | * would be if we allow user-land to specify a memory range through a | ||
156 | * system call/ioctl etc. instead of doing offline/online through /sysfs. | ||
157 | */ | ||
158 | int | ||
159 | walk_memory_resource(unsigned long start_pfn, unsigned long nr_pages, void *arg, | ||
160 | int (*func)(unsigned long, unsigned long, void *)) | ||
161 | { | ||
162 | return (*func)(start_pfn, nr_pages, arg); | ||
163 | } | ||
164 | |||
132 | #endif /* CONFIG_MEMORY_HOTPLUG */ | 165 | #endif /* CONFIG_MEMORY_HOTPLUG */ |
133 | 166 | ||
134 | void show_mem(void) | 167 | void show_mem(void) |