diff options
author | Christoph Lameter <clameter@sgi.com> | 2008-02-05 01:29:11 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 12:44:17 -0500 |
commit | 9f8f2172537de7af0b0fbd33502d18d52b1339bc (patch) | |
tree | 273c86583ed0295059c5526d3bd6927520a20add /mm/memory_hotplug.c | |
parent | e2848a0efedef4dad52d1334d37f8719cd6268fd (diff) |
Page allocator: clean up pcp draining functions
- Add comments explaing how drain_pages() works.
- Eliminate useless functions
- Rename drain_all_local_pages to drain_all_pages(). It does drain
all pages not only those of the local processor.
- Eliminate useless interrupt off / on sequences. drain_pages()
disables interrupts on its own. The execution thread is
pinned to processor by the caller. So there is no need to
disable interrupts.
- Put drain_all_pages() declaration in gfp.h and remove the
declarations from suspend.h and from mm/memory_hotplug.c
- Make software suspend call drain_all_pages(). The draining
of processor local pages is may not the right approach if
software suspend wants to support SMP. If they call drain_all_pages
then we can make drain_pages() static.
[akpm@linux-foundation.org: fix build]
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Acked-by: Mel Gorman <mel@csn.ul.ie>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Daniel Walker <dwalker@mvista.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/memory_hotplug.c')
-rw-r--r-- | mm/memory_hotplug.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 9512a544d044..7469c503580d 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c | |||
@@ -481,8 +481,6 @@ check_pages_isolated(unsigned long start_pfn, unsigned long end_pfn) | |||
481 | return offlined; | 481 | return offlined; |
482 | } | 482 | } |
483 | 483 | ||
484 | extern void drain_all_local_pages(void); | ||
485 | |||
486 | int offline_pages(unsigned long start_pfn, | 484 | int offline_pages(unsigned long start_pfn, |
487 | unsigned long end_pfn, unsigned long timeout) | 485 | unsigned long end_pfn, unsigned long timeout) |
488 | { | 486 | { |
@@ -540,7 +538,7 @@ repeat: | |||
540 | lru_add_drain_all(); | 538 | lru_add_drain_all(); |
541 | flush_scheduled_work(); | 539 | flush_scheduled_work(); |
542 | cond_resched(); | 540 | cond_resched(); |
543 | drain_all_local_pages(); | 541 | drain_all_pages(); |
544 | } | 542 | } |
545 | 543 | ||
546 | pfn = scan_lru_pages(start_pfn, end_pfn); | 544 | pfn = scan_lru_pages(start_pfn, end_pfn); |
@@ -563,7 +561,7 @@ repeat: | |||
563 | flush_scheduled_work(); | 561 | flush_scheduled_work(); |
564 | yield(); | 562 | yield(); |
565 | /* drain pcp pages , this is synchrouns. */ | 563 | /* drain pcp pages , this is synchrouns. */ |
566 | drain_all_local_pages(); | 564 | drain_all_pages(); |
567 | /* check again */ | 565 | /* check again */ |
568 | offlined_pages = check_pages_isolated(start_pfn, end_pfn); | 566 | offlined_pages = check_pages_isolated(start_pfn, end_pfn); |
569 | if (offlined_pages < 0) { | 567 | if (offlined_pages < 0) { |