lkml.org 
[lkml]   [2011]   [Oct]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [PATCH] PM: HIBERNATION: do not initialise statics and externals to 0 or NULL
Date
On Wednesday, October 12, 2011, Barry Song wrote:
> From: Barry Song <Baohua.Song@csr.com>
>
> Cc: Borislav Petkov <bp@alien8.de>
> Signed-off-by: Barry Song <Baohua.Song@csr.com>

Applied to linux-pm/linux-next.

Thanks,
Rafael


> ---
> This patch depends on Barry Song's
> PM: HIBERNATION: add resume_wait param to support MMC-like devices as resume file;
> http://www.spinics.net/lists/linux-mmc/msg10282.html
> PM: HIBERNATION: add resume_delay kernel param;
> http://www.spinics.net/lists/linux-mmc/msg10478.html
>
> kernel/power/hibernate.c | 10 +++++-----
> 1 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
> index f73a00e..19d443b 100644
> --- a/kernel/power/hibernate.c
> +++ b/kernel/power/hibernate.c
> @@ -30,14 +30,14 @@
> #include "power.h"
>
>
> -static int nocompress = 0;
> -static int noresume = 0;
> -static int resume_wait = 0;
> -static int resume_delay = 0;
> +static int nocompress;
> +static int noresume;
> +static int resume_wait;
> +static int resume_delay;
> static char resume_file[256] = CONFIG_PM_STD_PARTITION;
> dev_t swsusp_resume_device;
> sector_t swsusp_resume_block;
> -int in_suspend __nosavedata = 0;
> +int in_suspend __nosavedata;
>
> enum {
> HIBERNATION_INVALID,
>



\
 
 \ /
  Last update: 2011-10-12 23:35    [W:0.027 / U:0.164 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site