Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-02 17:11:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] swsusp: kill unneccessary does_collide_order

Browse Source 
The following patch removes the unnecessary function does_collide_order().

This function is no longer necessary, as currently there are only 0-order
allocations in swsusp, and the use of it is confusing.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Pavel Machek 2005-06-25 14:55:12 -07:00 committed by Linus Torvalds
parent 620b032764
commit 8f9bdf15c0
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
kernel/power/swsusp.c
View File

@ -929,21 +929,6 @@ int swsusp_resume(void)
return error; return error;
} }
/* More restore stuff */
/*
* Returns true if given address/order collides with any orig_address
*/
static int does_collide_order(unsigned long addr, int order)
{
int i;
for (i=0; i < (1<<order); i++)
if (!PageNosaveFree(virt_to_page(addr + i * PAGE_SIZE)))
return 1;
return 0;
}
/** /**
* On resume, for storing the PBE list and the image, * On resume, for storing the PBE list and the image,
* we can only use memory pages that do not conflict with the pages * we can only use memory pages that do not conflict with the pages
@ -973,7 +958,7 @@ static unsigned long get_usable_page(unsigned gfp_mask)
unsigned long m; unsigned long m;
m = get_zeroed_page(gfp_mask); m = get_zeroed_page(gfp_mask);
while (does_collide_order(m, 0)) { while (!PageNosaveFree(virt_to_page(m))) {
eat_page((void *)m); eat_page((void *)m);
m = get_zeroed_page(gfp_mask); m = get_zeroed_page(gfp_mask);
if (!m) if (!m)
@ -1061,7 +1046,7 @@ static struct pbe * swsusp_pagedir_relocate(struct pbe *pblist)
/* Relocate colliding pages */ /* Relocate colliding pages */
for_each_pb_page (pbpage, pblist) { for_each_pb_page (pbpage, pblist) {
if (does_collide_order((unsigned long)pbpage, 0)) { if (!PageNosaveFree(virt_to_page((unsigned long)pbpage))) {
m = (void *)get_usable_page(GFP_ATOMIC | __GFP_COLD); m = (void *)get_usable_page(GFP_ATOMIC | __GFP_COLD);
if (!m) { if (!m) {
error = -ENOMEM; error = -ENOMEM;