Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
-@@ -18,9 +18,9 @@ config UEVENT_HELPER_PATH
+@@ -18,9 +18,9 @@ config UEVENT_HELPER_PATH
config DEVTMPFS
bool "Maintain a devtmpfs filesystem to mount at /dev"
In this filesystem, the kernel driver core maintains device
nodes with their default names and permissions for all
registered devices with an assigned major/minor number.
-@@ -33,6 +33,9 @@ config DEVTMPFS
+@@ -33,6 +33,9 @@ config DEVTMPFS
functional /dev without any further help. It also allows simple
rescue systems, and reliably handles dynamic major/minor numbers.
depends on DEVTMPFS
--- a/drivers/base/devtmpfs.c
+++ b/drivers/base/devtmpfs.c
-@@ -20,6 +20,7 @@
+@@ -20,6 +20,7 @@
#include <linux/namei.h>
#include <linux/fs.h>
#include <linux/shmem_fs.h>
#include <linux/cred.h>
#include <linux/sched.h>
#include <linux/init_task.h>
-@@ -45,7 +46,11 @@ __setup("devtmpfs.mount=", mount_param);
+@@ -45,7 +46,11 @@ __setup("devtmpfs.mount=", mount_param);
static int dev_get_sb(struct file_system_type *fs_type, int flags,
const char *dev_name, void *data, struct vfsmount *mnt)
{
static struct file_system_type dev_fs_type = {
--- a/fs/ramfs/inode.c
+++ b/fs/ramfs/inode.c
-@@ -214,7 +214,7 @@ static int ramfs_parse_options(char *data, struct ramfs_mount_opts *opts)
+@@ -214,7 +214,7 @@ static int ramfs_parse_options(char *dat
return 0;
}
struct inode *inode = NULL;
--- a/include/linux/ramfs.h
+++ b/include/linux/ramfs.h
-@@ -20,4 +20,6 @@ extern const struct file_operations ramfs_file_operations;
+@@ -20,4 +20,6 @@ extern const struct file_operations ramf
extern const struct vm_operations_struct generic_file_vm_ops;
extern int __init init_rootfs(void);