Re: 2.6.13-rc2-mm1

[Brice Goglin <Brice.Goglin@ens-lyon.org>]

[-- Attachment #1: Type: text/plain, Size: 767 bytes --]

Le 07.07.2005 13:32, Brice Goglin a écrit :
> Le 07.07.2005 13:00, Andrew Morton a écrit :
> 
>>ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.13-rc2/2.6.13-rc2-mm1/
>>
>>(kernel.org seems to be stuck again - there's a copy at
>>http://www.zip.com.au/~akpm/linux/patches/stuff/2.6.13-rc2-mm1.gz)
> 
> 
>   CC      kernel/power/disk.o
> kernel/power/disk.c: Dans la fonction « software_resume »:
> kernel/power/disk.c:242: attention : implicit declaration of function
> `name_to_dev_t'
> 
> The attached patch adds an extern declaration in disk.c as it's
> already done in swsusp.c

Actually, we could even remove the one from swsusp.c since it's not
used anymore.
New patch attached.

Signed-off-by: Brice Goglin <Brice.Goglin@ens-lyon.org>

Brice

[-- Attachment #2: move_extern_name_to_dev_t_to_power_disk.patch --]
[-- Type: text/x-patch, Size: 729 bytes --]

--- linux-mm/kernel/power/swsusp.c.old	2005-07-07 13:41:09.000000000 +0200
+++ linux-mm/kernel/power/swsusp.c	2005-07-07 13:41:28.000000000 +0200
@@ -1261,8 +1261,6 @@ static int data_read(struct pbe *pblist)
 	return error;
 }
 
-extern dev_t name_to_dev_t(const char *line);
-
 /**
  *	read_pagedir - Read page backup list pages from swap
  */
--- linux-mm/kernel/power/disk.c.old	2005-07-07 13:28:52.000000000 +0200
+++ linux-mm/kernel/power/disk.c	2005-07-07 13:30:02.000000000 +0200
@@ -30,6 +30,7 @@ extern void swsusp_close(void);
 extern int swsusp_resume(void);
 extern int swsusp_free(void);
 
+extern dev_t name_to_dev_t(const char *line);
 
 static int noresume = 0;
 char resume_file[256] = CONFIG_PM_STD_PARTITION;