korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-30 07:34:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] VM: fix zone list restart in page allocatate

Browse Source 
We must reassign z before looping through the zones kicking kswapd,
since it will be NULL if we hit an OOM condition and jump back to the
beginning again. 'z' is initially assigned before the restart: label. So
move the restart label up a little.

Signed-off-by: Jens Axboe <axboe@suse.de>
This commit is contained in:
Jens Axboe 2005-11-17 21:35:02 +01:00 committed by Linus Torvalds
parent bb83398667
commit 6b1de9161e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mm/page_alloc.c
View File

@ -845,21 +845,22 @@ __alloc_pages(gfp_t gfp_mask, unsigned int order,
might_sleep_if(wait); might_sleep_if(wait);
restart:
z = zonelist->zones; /* the list of zones suitable for gfp_mask */ z = zonelist->zones; /* the list of zones suitable for gfp_mask */
if (unlikely(*z == NULL)) { if (unlikely(*z == NULL)) {
/* Should this ever happen?? */ /* Should this ever happen?? */
return NULL; return NULL;
} }
restart:
page = get_page_from_freelist(gfp_mask|__GFP_HARDWALL, order, page = get_page_from_freelist(gfp_mask|__GFP_HARDWALL, order,
zonelist, ALLOC_CPUSET); zonelist, ALLOC_CPUSET);
if (page) if (page)
goto got_pg; goto got_pg;
do do {
wakeup_kswapd(*z, order); wakeup_kswapd(*z, order);
while (*(++z)); } while (*(++z));
/* /*
* OK, we're below the kswapd watermark and have kicked background * OK, we're below the kswapd watermark and have kicked background