[Glibc-bsd-commits] r3992 - in trunk/freebsd-libs/debian: . patches

[Robert Millan]

Author: rmh
Date: 2012-01-21 00:00:53 +0000 (Sat, 21 Jan 2012)
New Revision: 3992

Added:
   trunk/freebsd-libs/debian/patches/cpumask_t.diff
Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/patches/series
Log:
cpumask_t.diff: Workaround for removal of cpumask_t in kfreebsd-9 headers.

Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2012-01-20 23:59:11 UTC (rev 3991)
+++ trunk/freebsd-libs/debian/changelog	2012-01-21 00:00:53 UTC (rev 3992)
@@ -1,8 +1,10 @@
 freebsd-libs (8.3~svn229725-3) UNRELEASED; urgency=low
 
   * Remove 15_kkh_kludge.diff, depend on recent k-k-h instead.
+  * cpumask_t.diff: Workaround for removal of cpumask_t in kfreebsd-9
+    headers.
 
- -- Robert Millan <rmh at debian.org>  Tue, 17 Jan 2012 20:39:00 +0100
+ -- Robert Millan <rmh at debian.org>  Sat, 21 Jan 2012 01:00:47 +0100
 
 freebsd-libs (8.3~svn229725-2) unstable; urgency=low
 

Added: trunk/freebsd-libs/debian/patches/cpumask_t.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/cpumask_t.diff	                        (rev 0)
+++ trunk/freebsd-libs/debian/patches/cpumask_t.diff	2012-01-21 00:00:53 UTC (rev 3992)
@@ -0,0 +1,15 @@
+
+Workaround removal of cpumask_t in recent kfreebsd headers.  Keep
+using the old interface for backward compatibility with kfreebsd 8.x.
+
+--- a/lib/libmemstat/memstat_uma.c
++++ b/lib/libmemstat/memstat_uma.c
+@@ -311,7 +311,7 @@
+ 	struct uma_keg *kzp, kz;
+ 	int hint_dontsearch, i, mp_maxid, ret;
+ 	char name[MEMTYPE_MAXNAME];
+-	__cpumask_t all_cpus;
++	unsigned int all_cpus;
+ 	kvm_t *kvm;
+ 
+ 	kvm = (kvm_t *)kvm_handle;

Modified: trunk/freebsd-libs/debian/patches/series
===================================================================
--- trunk/freebsd-libs/debian/patches/series	2012-01-20 23:59:11 UTC (rev 3991)
+++ trunk/freebsd-libs/debian/patches/series	2012-01-21 00:00:53 UTC (rev 3992)
@@ -13,3 +13,4 @@
 12_usb.diff
 13_jail.diff
 14_alias.diff
+cpumask_t.diff