[Glibc-bsd-commits] r3459 - in trunk/kfreebsd-9/debian: . patches

[Petr Salinger]

Author: ps-guest
Date: 2011-06-17 08:03:35 +0000 (Fri, 17 Jun 2011)
New Revision: 3459

Removed:
   trunk/kfreebsd-9/debian/patches/111_linprocfs_kthread.diff
Modified:
   trunk/kfreebsd-9/debian/changelog
   trunk/kfreebsd-9/debian/patches/series
Log:
Drop 111_linprocfs_kthread.diff, fixed upstream.



Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog	2011-06-17 08:00:49 UTC (rev 3458)
+++ trunk/kfreebsd-9/debian/changelog	2011-06-17 08:03:35 UTC (rev 3459)
@@ -1,7 +1,11 @@
-kfreebsd-9 (9.0~svn223109-1) UNRELEASED; urgency=low
+kfreebsd-9 (9.0~svn223182-1) UNRELEASED; urgency=low
 
+  [ Robert Millan ]
   * Add myself to Uploaders.
 
+  [ Petr Salinger ]
+  * Drop 111_linprocfs_kthread.diff, fixed upstream.
+
  -- Robert Millan <rmh at debian.org>  Thu, 16 Jun 2011 14:18:58 +0200
 
 kfreebsd-9 (9.0~svn223109-0.1) experimental; urgency=low

Deleted: trunk/kfreebsd-9/debian/patches/111_linprocfs_kthread.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/111_linprocfs_kthread.diff	2011-06-17 08:00:49 UTC (rev 3458)
+++ trunk/kfreebsd-9/debian/patches/111_linprocfs_kthread.diff	2011-06-17 08:03:35 UTC (rev 3459)
@@ -1,29 +0,0 @@
-
-See #630104
-Submitted upstream as http://www.freebsd.org/cgi/query-pr.cgi?pr=157871
-
-
---- a/sys/compat/linprocfs/linprocfs.c
-+++ b/sys/compat/linprocfs/linprocfs.c
-@@ -1049,6 +1049,10 @@
- 		PROC_UNLOCK(p);
- 		return (ret);
- 	}
-+	if (p->p_flag & P_KTHREAD) {
-+		PROC_UNLOCK(p);
-+		return (0);
-+	}
- 	if (p->p_args != NULL) {
- 		sbuf_bcpy(sb, p->p_args->ar_args, p->p_args->ar_length);
- 		PROC_UNLOCK(p);
-@@ -1073,6 +1077,10 @@
- 		PROC_UNLOCK(p);
- 		return (ret);
- 	}
-+	if (p->p_flag & P_KTHREAD) {
-+		PROC_UNLOCK(p);
-+		return (0);
-+	}
- 	PROC_UNLOCK(p);
- 
- 	ret = linprocfs_doargv(td, p, sb, ps_string_env);

Modified: trunk/kfreebsd-9/debian/patches/series
===================================================================
--- trunk/kfreebsd-9/debian/patches/series	2011-06-17 08:00:49 UTC (rev 3458)
+++ trunk/kfreebsd-9/debian/patches/series	2011-06-17 08:03:35 UTC (rev 3459)
@@ -11,7 +11,6 @@
 108_teken_utf8_table.diff
 109_linprocfs_non_x86.diff
 110_disable_trampoline_flavour.diff
-111_linprocfs_kthread.diff
 200_xen.diff
 902_version.diff
 903_disable_non-free_drivers.diff