1 diff -ruw linux-2.6.30.orig/fs/Kconfig linux-2.6.30/fs/Kconfig
2 --- linux-2.6.30.orig/fs/Kconfig 2009-02-12 17:51:15.000000000 +0000
3 +++ linux-2.6.30/fs/Kconfig 2009-02-13 12:01:55.000000000 +0000
6 If you don't know what Access Control Lists are, say N.
9 + bool "Use tmpfs instead of ramfs for initramfs"
10 + depends on TMPFS && SHMEM
13 + This replaces the ramfs used for unpacking the cpio images
17 + bool "Ramfs file system support" if TMPFS_ROOT
20 + Ramfs is a file system which keeps all files in RAM. Unlike tmpfs,
21 + it cannot be swapped to disk, and it has the risk of deadlocking
22 + the system by using all memory.
24 + Ramfs is used for booting the system and unpacking the cpio if
25 + TMPFS_ROOT is not set.
28 bool "HugeTLB file system support"
29 depends on X86 || IA64 || PPC64 || SPARC64 || (SUPERH && MMU) || \
30 diff -ruw linux-2.6.30.orig/fs/ramfs/inode.c linux-2.6.30/fs/ramfs/inode.c
31 --- linux-2.6.30.orig/fs/ramfs/inode.c 2009-02-12 17:51:15.000000000 +0000
32 +++ linux-2.6.30/fs/ramfs/inode.c 2009-02-13 11:30:30.000000000 +0000
34 return mount_nodev(fs_type, flags, data, ramfs_fill_super);
37 -static struct dentry *rootfs_mount(struct file_system_type *fs_type,
38 - int flags, const char *dev_name, void *data)
40 - return mount_nodev(fs_type, flags|MS_NOUSER, data, ramfs_fill_super);
43 static void ramfs_kill_sb(struct super_block *sb)
48 .kill_sb = ramfs_kill_sb,
51 +#ifndef CONFIG_TMPFS_ROOT
52 +static struct dentry *rootfs_mount(struct file_system_type *fs_type,
53 + int flags, const char *dev_name, void *data)
55 + return mount_nodev(fs_type, flags|MS_NOUSER, data, ramfs_fill_super);
58 static struct file_system_type rootfs_fs_type = {
60 .mount = rootfs_mount,
61 .kill_sb = kill_litter_super,
64 -static int __init init_ramfs_fs(void)
66 - return register_filesystem(&ramfs_fs_type);
68 -module_init(init_ramfs_fs)
70 int __init init_rootfs(void)
79 +static int __init init_ramfs_fs(void)
81 + return register_filesystem(&ramfs_fs_type);
83 +module_init(init_ramfs_fs)
86 diff -ruw linux-2.6.30.orig/mm/shmem.c linux-2.6.30/mm/shmem.c
87 --- linux-2.6.30.orig/mm/shmem.c 2009-02-12 17:51:15.000000000 +0000
88 +++ linux-2.6.30/mm/shmem.c 2009-02-13 11:42:02.000000000 +0000
91 static unsigned long shmem_default_max_blocks(void)
93 - return totalram_pages / 2;
94 + return totalram_pages / 10 * 9;
97 static unsigned long shmem_default_max_inodes(void)
98 @@ -2369,6 +2369,10 @@
100 static int shmem_init_inodecache(void)
102 +#ifdef CONFIG_TMPFS_ROOT
103 + if (shmem_inode_cachep)
106 shmem_inode_cachep = kmem_cache_create("shmem_inode_cache",
107 sizeof(struct shmem_inode_info),
108 0, SLAB_PANIC, init_once);
109 @@ -2587,6 +2591,27 @@
111 EXPORT_SYMBOL_GPL(shmem_file_setup);
113 +#ifdef CONFIG_TMPFS_ROOT
120 +static struct file_system_type rootfs_fs_type = {
122 + .mount = shmem_mount,
123 + .kill_sb = kill_litter_super,
126 +int __init init_rootfs(void)
128 + if (shmem_init_inodecache())
129 + panic("Can't initialize shm inode cache");
130 + return register_filesystem(&rootfs_fs_type);
135 * shmem_zero_setup - setup a shared anonymous mapping
136 * @vma: the vma to be mmapped is prepared by do_mmap_pgoff