Skip to content

L
linux
Commit 13c5afb9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge bk://linux-dj.bkbits.net/agpgart 

into home.transmeta.com:/home/torvalds/v2.5/linux
parents 21a19f5d 6171369f
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
mm/vmscan.c
View file @ 13c5afb9
...@@ -1010,7 +1010,11 @@ int shrink_all_memory(int nr_pages) ...@@ -1010,7 +1010,11 @@ int shrink_all_memory(int nr_pages)
pg_data_t *pgdat; pg_data_t *pgdat;
int nr_to_free = nr_pages; int nr_to_free = nr_pages;
int ret = 0; int ret = 0;
struct reclaim_state reclaim_state = {
.reclaimed_slab = 0,
};
current->reclaim_state = &reclaim_state;
for_each_pgdat(pgdat) { for_each_pgdat(pgdat) {
int freed; int freed;
struct page_state ps; struct page_state ps;
...@@ -1022,6 +1026,7 @@ int shrink_all_memory(int nr_pages) ...@@ -1022,6 +1026,7 @@ int shrink_all_memory(int nr_pages)
if (nr_to_free <= 0) if (nr_to_free <= 0)
break; break;
} }
current->reclaim_state = NULL;
return ret; return ret;
} }
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7