Re: Suspend2 Merge: e820 table support.

[Pavel Machek]

Hi!

> This patch adds support for the e820 table for swsusp and Suspend2. It
> does so by setting the NoSave flag for unsavable pages at boot time.

> @@ -27,6 +27,9 @@
>  #include <linux/slab.h>
>  #include <linux/proc_fs.h>
>  #include <linux/efi.h>
> +#ifdef CONFIG_SOFTWARE_SUSPEND2
> +#include <linux/suspend-common.h>
> +#endif
>  
>  #include <asm/processor.h>
>  #include <asm/system.h>
> @@ -264,12 +267,19 @@
>  {
>  	if (page_is_ram(pfn) && !(bad_ppro && page_kills_ppro(pfn))) {
>  		ClearPageReserved(page);
> +#ifdef CONFIG_SOFTWARE_SUSPEND2
> +		ClearPageNosave(page);
> +#endif
>  		set_bit(PG_highmem, &page->flags);
>  		set_page_count(page, 1);
>  		__free_page(page);
>  		totalhigh_pages++;
> -	} else
> +	} else {
>  		SetPageReserved(page);
> +#ifdef CONFIG_SOFTWARE_SUSPEND2
> +		SetPageNosave(page);
> +#endif
> +	}
>  }
>  
>  #ifndef CONFIG_DISCONTIGMEM

Please, do not put ifdefs around #includes and statements like
ClearPageNosave. (And is it neccessary at all? I'd just say that all
pages that are Reserved are Nosave automatically.)

> +#ifdef CONFIG_SOFTWARE_SUSPEND2
> +			/*
> +			 * Mark nosave pages
> +			 */
> +			if (addr >= (void *)&__nosave_begin && addr < (void *)&__nosave_end)
> +				SetPageNosave(mem_map+tmp);
> +		} else
> +			/*
> +			 * Non-RAM pages are always nosave
> +			 */
> +			SetPageNosave(mem_map+tmp);
> +#else
> +		}
> +#endif
> +	}

Current -mm code does something funny with Nosave; I'm not sure it
will not try to free them after resume. I have fix in my tree but it
is little tested.
								Pavel
-- 
People were complaining that M$ turns users into beta-testers...
...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/