r1031 - trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches

[Joshua Kwan]

Author: joshk
Date: 2004-08-11 22:08:43 -0600 (Wed, 11 Aug 2004)
New Revision: 1031

Added:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/057_init_unshare.diff
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/058_do_mounts_printk.diff
Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/patch-2.4.26-1
Log:
that's all folks\!

Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/057_init_unshare.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/057_init_unshare.diff	2004-08-12 04:05:32 UTC (rev 1030)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/057_init_unshare.diff	2004-08-12 04:08:43 UTC (rev 1031)
@@ -0,0 +1,11 @@
+--- kernel-source-2.4.26/kernel/fork.c	2004-04-14 23:05:40.000000000 +1000
++++ kernel-source-2.4.26-1/kernel/fork.c	2004-04-17 14:24:07.000000000 +1000
+@@ -562,7 +562,7 @@
+ 		
+ 	/* This can race but the race causes us to copy when we don't
+ 	   need to and drop the copy */
+-	if(atomic_read(&files->count) == 1)
++	if(atomic_read(&files->count) == 1 || current->pid == 1)
+ 	{
+ 		atomic_inc(&files->count);
+ 		return 0;

Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/058_do_mounts_printk.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/058_do_mounts_printk.diff	2004-08-12 04:05:32 UTC (rev 1030)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/058_do_mounts_printk.diff	2004-08-12 04:08:43 UTC (rev 1031)
@@ -0,0 +1,27 @@
+diff -urN kernel-source-2.4.26/init/do_mounts.c kernel-source-2.4.26-1/init/do_mounts.c
+--- kernel-source-2.4.26/init/do_mounts.c	2003-11-29 05:26:21.000000000 +1100
++++ kernel-source-2.4.26-1/init/do_mounts.c	2003-11-29 20:53:51.000000000 +1100
+@@ -648,11 +648,11 @@
+ 		goto done;
+ 	}
+ 
+-	printk(KERN_NOTICE "RAMDISK: Loading %d blocks [%ld disk%s] into ram disk... ", 
++	printk(KERN_NOTICE "RAMDISK: Loading %d blocks [%lu disk%s] into ram disk... ", 
+ 		nblocks, ((nblocks-1)/devblocks)+1, nblocks>devblocks ? "s" : "");
+ 	for (i=0; i < nblocks; i++) {
+ 		if (i && (i % devblocks == 0)) {
+-			printk("done disk #%ld.\n", i/devblocks);
++			printk("done disk #%lu.\n", i/devblocks);
+ 			rotate = 0;
+ 			if (close(in_fd)) {
+ 				printk("Error closing the disk.\n");
+@@ -664,7 +664,7 @@
+ 				printk("Error opening disk.\n");
+ 				goto noclose_input;
+ 			}
+-			printk("Loading disk #%ld... ", i/devblocks+1);
++			printk("Loading disk #%lu... ", i/devblocks+1);
+ 		}
+ 		read(in_fd, buf, BLOCK_SIZE);
+ 		write(out_fd, buf, BLOCK_SIZE);
+

Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/patch-2.4.26-1
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/patch-2.4.26-1	2004-08-12 04:05:32 UTC (rev 1030)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/patch-2.4.26-1	2004-08-12 04:08:43 UTC (rev 1031)
@@ -8789,32 +8789,6 @@
 +
 +#endif /* _LINUX_XATTR_ACL_H */
 
-diff -urN kernel-source-2.4.26/init/do_mounts.c kernel-source-2.4.26-1/init/do_mounts.c
---- kernel-source-2.4.26/init/do_mounts.c	2003-11-29 05:26:21.000000000 +1100
-+++ kernel-source-2.4.26-1/init/do_mounts.c	2003-11-29 20:53:51.000000000 +1100
-@@ -648,11 +648,11 @@
- 		goto done;
- 	}
- 
--	printk(KERN_NOTICE "RAMDISK: Loading %d blocks [%ld disk%s] into ram disk... ", 
-+	printk(KERN_NOTICE "RAMDISK: Loading %d blocks [%lu disk%s] into ram disk... ", 
- 		nblocks, ((nblocks-1)/devblocks)+1, nblocks>devblocks ? "s" : "");
- 	for (i=0; i < nblocks; i++) {
- 		if (i && (i % devblocks == 0)) {
--			printk("done disk #%ld.\n", i/devblocks);
-+			printk("done disk #%lu.\n", i/devblocks);
- 			rotate = 0;
- 			if (close(in_fd)) {
- 				printk("Error closing the disk.\n");
-@@ -664,7 +664,7 @@
- 				printk("Error opening disk.\n");
- 				goto noclose_input;
- 			}
--			printk("Loading disk #%ld... ", i/devblocks+1);
-+			printk("Loading disk #%lu... ", i/devblocks+1);
- 		}
- 		read(in_fd, buf, BLOCK_SIZE);
- 		write(out_fd, buf, BLOCK_SIZE);
 
 diff -urN kernel-source-2.4.26/kernel/Makefile kernel-source-2.4.26-1/kernel/Makefile
 --- kernel-source-2.4.26/kernel/Makefile	2001-09-17 14:22:40.000000000 +1000
@@ -8839,15 +8813,8 @@
  
  static inline int copy_fs(unsigned long clone_flags, struct task_struct * tsk)
  {
-@@ -561,7 +562,7 @@
- 		
- 	/* This can race but the race causes us to copy when we don't
- 	   need to and drop the copy */
--	if(atomic_read(&files->count) == 1)
-+	if(atomic_read(&files->count) == 1 || current->pid == 1)
- 	{
- 		atomic_inc(&files->count);
- 		return 0;
+ 
+
 diff -urN kernel-source-2.4.26/kernel/ksyms.c kernel-source-2.4.26-1/kernel/ksyms.c
 --- kernel-source-2.4.26/kernel/ksyms.c	2004-02-19 00:36:32.000000000 +1100
 +++ kernel-source-2.4.26-1/kernel/ksyms.c	2004-02-22 20:28:35.000000000 +1100