Commit de491861 authored by Pavel Machek's avatar Pavel Machek Committed by Linus Torvalds
Browse files

[PATCH] swsusp: cleanups 



Reduce number of ifdefs somehow, and fix whitespace a bit.  No real code
changes.

Signed-off-by: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 96bc7aec

kernel/power/snapshot.c

+10 −12
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 


#include "power.h"





#ifdef CONFIG_HIGHMEM

struct highmem_page {

	char *data;
@@ -88,12 +87,10 @@ static int save_highmem_zone(struct zone *zone) 
	}

	return 0;

}

#endif /* CONFIG_HIGHMEM */





static int save_highmem(void)

{

#ifdef CONFIG_HIGHMEM

	struct zone *zone;

	int res = 0;
@@ -104,13 +101,11 @@ static int save_highmem(void) 
		if (res)

			return res;

	}

#endif

	return 0;

}



int restore_highmem(void)

{

#ifdef CONFIG_HIGHMEM

	printk("swsusp: Restoring Highmem\n");

	while (highmem_copy) {

		struct highmem_page *save = highmem_copy;
@@ -123,9 +118,12 @@ int restore_highmem(void) 
		free_page((long) save->data);

		kfree(save);

	}

#endif

	return 0;

}

#else

static int save_highmem(void) { return 0; }

int restore_highmem(void) { return 0; }

#endif /* CONFIG_HIGHMEM */





static int pfn_is_nosave(unsigned long pfn)
@@ -304,12 +302,12 @@ struct pbe * alloc_pagedir(unsigned nr_pages) 
		return NULL;



	pr_debug("alloc_pagedir(): nr_pages = %d\n", nr_pages);

	pblist = (struct pbe *)alloc_image_page();

	pblist = alloc_image_page();

	/* FIXME: rewrite this ugly loop */

	for (pbe = pblist, num = PBES_PER_PAGE; pbe && num < nr_pages;

        		pbe = pbe->next, num += PBES_PER_PAGE) {

		pbe += PB_PAGE_SKIP;

		pbe->next = (struct pbe *)alloc_image_page();

		pbe->next = alloc_image_page();

	}

	if (!pbe) { /* get_zeroed_page() failed */

		free_pagedir(pblist);