diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-22 14:34:09 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-22 14:34:09 -0400 |
| commit | f20e3b5fe7ead0615309433260b9784d8da0bbbd (patch) | |
| tree | eabb2e47a0355ac4e8024b7087b4e7cb9f324358 /arch/s390/mm/init.c | |
| parent | bcbfe664e7af019e698cef2feb85ac2b4f1ac11d (diff) | |
| parent | f030d7b65e4e6399f23de2a41a58d1b607b6bd89 (diff) | |
Merge branch 'for-rmk' of git://git.android.com/kernel into devel
Diffstat (limited to 'arch/s390/mm/init.c')
| -rw-r--r-- | arch/s390/mm/init.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c index 1169130a97ef..158b0d6d7046 100644 --- a/arch/s390/mm/init.c +++ b/arch/s390/mm/init.c | |||
| @@ -189,14 +189,3 @@ int arch_add_memory(int nid, u64 start, u64 size) | |||
| 189 | return rc; | 189 | return rc; |
| 190 | } | 190 | } |
| 191 | #endif /* CONFIG_MEMORY_HOTPLUG */ | 191 | #endif /* CONFIG_MEMORY_HOTPLUG */ |
| 192 | |||
| 193 | #ifdef CONFIG_MEMORY_HOTREMOVE | ||
| 194 | int remove_memory(u64 start, u64 size) | ||
| 195 | { | ||
| 196 | unsigned long start_pfn, end_pfn; | ||
| 197 | |||
| 198 | start_pfn = PFN_DOWN(start); | ||
| 199 | end_pfn = start_pfn + PFN_DOWN(size); | ||
| 200 | return offline_pages(start_pfn, end_pfn, 120 * HZ); | ||
| 201 | } | ||
| 202 | #endif /* CONFIG_MEMORY_HOTREMOVE */ | ||