[PATCH] name_to_dev_t warning fix

kernel/power/disk.c needs a declaration of name_to_dev_t() in scope.  mount.h
seems like an appropriate choice.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/include/linux/mount.h b/include/linux/mount.h
index 74b4727a4e3023aef8b411118a2e705e26321b75..f8f39937e301be584f3258881f5740457234cb31 100644 (file)
--- a/include/linux/mount.h
+++ b/include/linux/mount.h
@@ -12,6 +12,7 @@
 #define _LINUX_MOUNT_H
 #ifdef __KERNEL__
 
+#include <linux/types.h>
 #include <linux/list.h>
 #include <linux/spinlock.h>
 #include <asm/atomic.h>
@@ -76,6 +77,7 @@ extern int do_add_mount(struct vfsmount *newmnt, struct nameidata *nd,
 extern void mark_mounts_for_expiry(struct list_head *mounts);
 
 extern spinlock_t vfsmount_lock;
+extern dev_t name_to_dev_t(char *name);
 
 #endif
 #endif /* _LINUX_MOUNT_H */

diff --git a/init/do_mounts.c b/init/do_mounts.c
index b7570c074d0fe7929258bbc4d43d7cb52206087e..1b02be734cccf51703efbcdd01d4cf5602311314 100644 (file)
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -7,6 +7,7 @@
 #include <linux/root_dev.h>
 #include <linux/security.h>
 #include <linux/delay.h>
+#include <linux/mount.h>
 
 #include <linux/nfs_fs.h>
 #include <linux/nfs_fs_sb.h>

diff --git a/init/do_mounts.h b/init/do_mounts.h
index de92bee4f35e7b9e03a5871e0d7c96c4c4bcc608..e0a7ac9649e1e4c10c080a7691744ce62e6bc497 100644 (file)
--- a/init/do_mounts.h
+++ b/init/do_mounts.h
@@ -9,7 +9,6 @@
 #include <linux/major.h>
 #include <linux/root_dev.h>
 
-dev_t name_to_dev_t(char *name);
 void  change_floppy(char *fmt, ...);
 void  mount_block_root(char *name, int flags);
 void  mount_root(void);

diff --git a/kernel/power/disk.c b/kernel/power/disk.c
index c51a4d96d4ebc68c469d40bb1cdd3c31605c1aad..3ec789c6b537718ec0fe5a3390270fe7d7d433d6 100644 (file)
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
@@ -16,6 +16,8 @@
 #include <linux/device.h>
 #include <linux/delay.h>
 #include <linux/fs.h>
+#include <linux/mount.h>
+
 #include "power.h"
 
 

diff --git a/kernel/power/swsusp.c b/kernel/power/swsusp.c
index 7d7801cd01f0fabdcae0bbad78d24fe0a4da2b66..f2bc71b9fe8be2dd226addc38ea7a7e48783317e 100644 (file)
--- a/kernel/power/swsusp.c
+++ b/kernel/power/swsusp.c
@@ -63,6 +63,7 @@
 #include <linux/console.h>
 #include <linux/highmem.h>
 #include <linux/bio.h>
+#include <linux/mount.h>
 
 #include <asm/uaccess.h>
 #include <asm/mmu_context.h>
@@ -1260,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
  */