[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>
This commit is contained in:
parent
22a4427972
commit
d53d9f16ea
@ -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 */
|
||||
|
@ -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>
|
||||
|
@ -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);
|
||||
|
@ -16,6 +16,8 @@
|
||||
#include <linux/device.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/fs.h>
|
||||
#include <linux/mount.h>
|
||||
|
||||
#include "power.h"
|
||||
|
||||
|
||||
|
@ -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
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user