Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 117247
b: refs/heads/master
c: 5e451d9
h: refs/heads/master
i:
  117245: ce358b5
  117243: 753b6e5
  117239: 13d38b4
  117231: ff2a9ce
  117215: 79bd32d
  117183: 70be868
  117119: 278bf66
  116991: 3bf053d
  116735: 93efc13
v: v3
  • Loading branch information
Andrew Morton authored and Paul Mundt committed Oct 21, 2008
1 parent 8562649 commit 296cd3e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 18 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a51413a65f14e8e872d4da21f7a83656c7abb603
refs/heads/master: 5e451d9c9d2c20c4f037a0854d3ecca0a69aa56a
17 changes: 0 additions & 17 deletions trunk/arch/sh/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -321,21 +321,4 @@ int memory_add_physaddr_to_nid(u64 addr)
}
EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid);
#endif

#ifdef CONFIG_MEMORY_HOTREMOVE
int remove_memory(u64 start, u64 size)
{
unsigned long start_pfn = start >> PAGE_SHIFT;
unsigned long end_pfn = start_pfn + (size >> PAGE_SHIFT);
int ret;

ret = offline_pages(start_pfn, end_pfn, 120 * HZ);
if (unlikely(ret))
printk("%s: Failed, offline_pages() == %d\n", __func__, ret);

return ret;
}
EXPORT_SYMBOL_GPL(remove_memory);
#endif

#endif /* CONFIG_MEMORY_HOTPLUG */

0 comments on commit 296cd3e

Please sign in to comment.