Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 176301
b: refs/heads/master
c: b4e655a
h: refs/heads/master
i:
  176299: 0c58b2c
v: v3
  • Loading branch information
Andrew Morton authored and Linus Torvalds committed Dec 15, 2009
1 parent 90435c9 commit a0f3845
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 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: d0f209f68f80f9a152799760c230019e7f270b2a
refs/heads/master: b4e655a4aaa327810110457cef92681447dd13e4
1 change: 0 additions & 1 deletion trunk/include/linux/memory_hotplug.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ extern void online_page(struct page *page);
/* VM interface that may be used by firmware interface */
extern int online_pages(unsigned long, unsigned long);
extern void __offline_isolated_pages(unsigned long, unsigned long);
extern int offline_pages(unsigned long, unsigned long, unsigned long);

/* reasonably generic interface to expand the physical pages in a zone */
extern int __add_pages(int nid, struct zone *zone, unsigned long start_pfn,
Expand Down
2 changes: 1 addition & 1 deletion trunk/mm/memory_hotplug.c
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,7 @@ check_pages_isolated(unsigned long start_pfn, unsigned long end_pfn)
return offlined;
}

int offline_pages(unsigned long start_pfn,
static int offline_pages(unsigned long start_pfn,
unsigned long end_pfn, unsigned long timeout)
{
unsigned long pfn, nr_pages, expire;
Expand Down

0 comments on commit a0f3845

Please sign in to comment.