SOURCES (LINUX_2_6): kernel-inittmpfs.patch - 2.6.29

[areq]

Author: areq                         Date: Wed Mar 25 22:33:03 2009 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- 2.6.29

---- Files affected:
SOURCES:
   kernel-inittmpfs.patch (1.1.2.3 -> 1.1.2.4) 

---- Diffs:

================================================================
Index: SOURCES/kernel-inittmpfs.patch
diff -u SOURCES/kernel-inittmpfs.patch:1.1.2.3 SOURCES/kernel-inittmpfs.patch:1.1.2.4
--- SOURCES/kernel-inittmpfs.patch:1.1.2.3	Fri Jan  2 16:00:49 2009
+++ SOURCES/kernel-inittmpfs.patch	Wed Mar 25 23:32:57 2009
@@ -110,25 +110,24 @@
 diff -ur linux-2.6.14.orig/mm/shmem.c linux-2.6.14/mm/shmem.c
 --- linux-2.6.14.orig/mm/shmem.c	2005-09-11 03:19:07.000000000 +0000
 +++ linux-2.6.14/mm/shmem.c	2005-09-11 03:19:42.000000000 +0000
-@@ -2136,7 +2136,7 @@
+@@ -2504,7 +2504,7 @@
+ 	.kill_sb	= kill_litter_super,
  };
- static struct vfsmount *shm_mnt;
  
 -static int __init init_tmpfs(void)
 +int __init init_tmpfs(void)
  {
  	int error;
  
-@@ -2169,7 +2169,12 @@
- 	shm_mnt = ERR_PTR(error);
- 	return error;
+@@ -2672,4 +2672,9 @@
+ 	return 0;
  }
+ 
+-module_init(init_tmpfs)
 +/* Don't do this if we are calling it early explicity */
 +#ifndef CONFIG_EARLYUSERSPACE_ON_TMPFS
 +/* If CONFIG_EARLYUSERSPACE_ON_TMPFS is set then we will interpose
 + * ramfs so this will get called explicitly and early */
- module_init(init_tmpfs)
++ module_init(init_tmpfs)
 +#endif /* !CONFIG_EARLYUSERSPACE_ON_TMPFS */
- 
- /*
-  * shmem_file_setup - get an unlinked file living in tmpfs
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-inittmpfs.patch?r1=1.1.2.3&r2=1.1.2.4&f=u