{
int error = 0;
int i;
- unsigned int mod = nr_copy_pages / 100;
- if (!mod)
- mod = 1;
-
- printk( "Writing data to swap (%d pages)... ", nr_copy_pages );
+ printk( "Writing data to swap (%d pages): ", nr_copy_pages );
for (i = 0; i < nr_copy_pages && !error; i++) {
- if (!(i%mod))
- printk( "\b\b\b\b%3d%%", i / mod );
+ if (!(i%100))
+ printk( "." );
error = write_page((pagedir_nosave+i)->address,
&((pagedir_nosave+i)->swap_address));
}
- printk("\b\b\b\bdone\n");
+ printk(" %d Pages done.\n",i);
return error;
}
int suspend_prepare_image(void)
{
- unsigned int nr_needed_pages;
+ unsigned int nr_needed_pages = 0;
int error;
pr_debug("swsusp: critical section: \n");
if (save_highmem()) {
printk(KERN_CRIT "Suspend machine: Not enough free pages for highmem\n");
- restore_highmem();
return -ENOMEM;
}
{
int error = 0;
- if ((error = swsusp_swap_check())) {
- printk(KERN_ERR "swsusp: FATAL: cannot find swap device, try "
- "swapon -a!\n");
+ if ((error = swsusp_swap_check()))
return error;
- }
return suspend_prepare_image();
}
c = *c;
free_pages((unsigned long)f, pagedir_order);
}
- if (ret)
- return ret;
printk("|\n");
return check_pagedir();
}
*/
error = bio_write_page(0, &swsusp_header);
} else {
- pr_debug(KERN_ERR "swsusp: Suspend partition has wrong signature?\n");
+ pr_debug(KERN_ERR "swsusp: Invalid partition type.\n");
return -EINVAL;
}
if (!error)
struct pbe * p;
int error;
int i;
- int mod = nr_copy_pages / 100;
-
- if (!mod)
- mod = 1;
if ((error = swsusp_pagedir_relocate()))
return error;
- printk( "Reading image data (%d pages): ", nr_copy_pages );
+ printk( "Reading image data (%d pages): ", nr_copy_pages );
for(i = 0, p = pagedir_nosave; i < nr_copy_pages && !error; i++, p++) {
- if (!(i%mod))
- printk( "\b\b\b\b%3d%%", i / mod );
+ if (!(i%100))
+ printk( "." );
error = bio_read_page(swp_offset(p->swap_address),
(void *)p->address);
}