[Glibc-bsd-commits] r3441 - in trunk/kfreebsd-8/debian: . patches

[Petr Salinger]

Author: ps-guest
Date: 2011-06-14 11:18:16 +0000 (Tue, 14 Jun 2011)
New Revision: 3441

Added:
   trunk/kfreebsd-8/debian/patches/111_linprocfs_kthread.diff
Modified:
   trunk/kfreebsd-8/debian/changelog
   trunk/kfreebsd-8/debian/patches/series
Log:
fix /proc/$PID/cmdline for kernel-only processes



Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog	2011-06-12 10:10:24 UTC (rev 3440)
+++ trunk/kfreebsd-8/debian/changelog	2011-06-14 11:18:16 UTC (rev 3441)
@@ -12,6 +12,9 @@
   * Add lintian override for "embedded-library" (zlib.ko).
   * Automatically propagate GCC version dependency to debian/control.
 
+  [ Petr Salinger ]
+  * Add 111_linprocfs_kthread.diff. Closes #630104.
+
  -- Aurelien Jarno <aurel32 at debian.org>  Sat, 19 Feb 2011 23:01:52 +0100
 
 kfreebsd-8 (8.2-1) unstable; urgency=low

Added: trunk/kfreebsd-8/debian/patches/111_linprocfs_kthread.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/111_linprocfs_kthread.diff	                        (rev 0)
+++ trunk/kfreebsd-8/debian/patches/111_linprocfs_kthread.diff	2011-06-14 11:18:16 UTC (rev 3441)
@@ -0,0 +1,29 @@
+
+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
+@@ -1044,6 +1044,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);
+@@ -1068,6 +1072,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-8/debian/patches/series
===================================================================
--- trunk/kfreebsd-8/debian/patches/series	2011-06-12 10:10:24 UTC (rev 3440)
+++ trunk/kfreebsd-8/debian/patches/series	2011-06-14 11:18:16 UTC (rev 3441)
@@ -16,6 +16,7 @@
 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