diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-24 14:41:59 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-24 14:41:59 -0700 |
| commit | 7104c136bf76a0070dca727bd4211ee7c2042dc4 (patch) | |
| tree | d7b832f3a35379b026c0f043a61a660e32c8b17b | |
| parent | cfa298a4030b4f8d3f617ae19e91a8311db94d66 (diff) | |
| download | patches-7104c136bf76a0070dca727bd4211ee7c2042dc4.tar.gz | |
2.6.30-git22
| -rw-r--r-- | driver-core/driver-core-devtmpfs-driver-core-maintained-dev-tmpfs.patch | 14 | ||||
| -rw-r--r-- | version | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/driver-core/driver-core-devtmpfs-driver-core-maintained-dev-tmpfs.patch b/driver-core/driver-core-devtmpfs-driver-core-maintained-dev-tmpfs.patch index e65554fe4caba7..80f377b03376a0 100644 --- a/driver-core/driver-core-devtmpfs-driver-core-maintained-dev-tmpfs.patch +++ b/driver-core/driver-core-devtmpfs-driver-core-maintained-dev-tmpfs.patch @@ -531,7 +531,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/include/linux/shmem_fs.h +++ b/include/linux/shmem_fs.h -@@ -42,6 +42,9 @@ static inline struct shmem_inode_info *S +@@ -38,6 +38,9 @@ static inline struct shmem_inode_info *S return container_of(inode, struct shmem_inode_info, vfs_inode); } @@ -554,7 +554,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - --- a/init/main.c +++ b/init/main.c -@@ -67,6 +67,7 @@ +@@ -68,6 +68,7 @@ #include <linux/async.h> #include <linux/kmemcheck.h> #include <linux/kmemtrace.h> @@ -562,7 +562,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #include <trace/boot.h> #include <asm/io.h> -@@ -813,6 +814,7 @@ static void __init do_basic_setup(void) +@@ -808,6 +809,7 @@ static void __init do_basic_setup(void) init_workqueues(); cpuset_init_smp(); usermodehelper_init(); @@ -572,7 +572,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> do_ctors(); --- a/mm/shmem.c +++ b/mm/shmem.c -@@ -2297,8 +2297,7 @@ static void shmem_put_super(struct super +@@ -2298,8 +2298,7 @@ static void shmem_put_super(struct super sb->s_fs_info = NULL; } @@ -582,7 +582,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> { struct inode *inode; struct dentry *root; -@@ -2523,7 +2522,7 @@ static struct file_system_type tmpfs_fs_ +@@ -2519,7 +2518,7 @@ static struct file_system_type tmpfs_fs_ .kill_sb = kill_litter_super, }; @@ -591,7 +591,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> { int error; -@@ -2580,7 +2579,7 @@ static struct file_system_type tmpfs_fs_ +@@ -2576,7 +2575,7 @@ static struct file_system_type tmpfs_fs_ .kill_sb = kill_litter_super, }; @@ -600,7 +600,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> { BUG_ON(register_filesystem(&tmpfs_fs_type) != 0); -@@ -2691,5 +2690,3 @@ int shmem_zero_setup(struct vm_area_stru +@@ -2687,5 +2686,3 @@ int shmem_zero_setup(struct vm_area_stru vma->vm_ops = &shmem_vm_ops; return 0; } @@ -1 +1 @@ -2.6.30-git18 +2.6.30-git22 |