[Glibc-bsd-commits] r5555 - in trunk/kfreebsd-kernel-headers/debian: . patches

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2014-09-20 02:55:57 +0000 (Sat, 20 Sep 2014)
New Revision: 5555

Added:
   trunk/kfreebsd-kernel-headers/debian/patches/containerof.diff
Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/patches/series
Log:
containerof.diff: work around a regression affecting libgtop2,
revert to using member2struct instead of __containerof


Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2014-09-20 02:55:01 UTC (rev 5554)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2014-09-20 02:55:57 UTC (rev 5555)
@@ -10,6 +10,8 @@
     Most consumers are able to use both.
   * Add sys/_pctrie.h, needed for sys/vnode.h with _KVM_VNODE
     - add testcase vnode.c for this
+  * containerof.diff: work around a regression affecting libgtop2, 
+    revert to using member2struct instead of __containerof 
 
  -- GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>  Sat, 20 Sep 2014 00:22:24 +0100
 

Added: trunk/kfreebsd-kernel-headers/debian/patches/containerof.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/containerof.diff	                        (rev 0)
+++ trunk/kfreebsd-kernel-headers/debian/patches/containerof.diff	2014-09-20 02:55:57 UTC (rev 5555)
@@ -0,0 +1,20 @@
+From: Steven Chamberlain <steven at pyro.eu.org>
+Subject: fix regression affecting libgtop2
+Forwarded: not-needed
+
+Undo a change to this file made in r240539;  return to using
+member2struct (available in sys/param.h) instead of the newer
+__containerof interface (which is not available in GNU libc
+sys/cdefs.h).
+
+--- a/sys/fs/devfs/devfs_int.h
++++ b/sys/fs/devfs/devfs_int.h
+@@ -69,7 +69,7 @@
+ 	LIST_HEAD(, cdev_privdata) cdp_fdpriv;
+ };
+ 
+-#define	cdev2priv(c)	__containerof(c, struct cdev_priv, cdp_c)
++#define	cdev2priv(c)	member2struct(cdev_priv, cdp_c, c)
+ 
+ struct cdev	*devfs_alloc(int);
+ int	devfs_dev_exists(const char *);

Modified: trunk/kfreebsd-kernel-headers/debian/patches/series
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/series	2014-09-20 02:55:01 UTC (rev 5554)
+++ trunk/kfreebsd-kernel-headers/debian/patches/series	2014-09-20 02:55:57 UTC (rev 5555)
@@ -32,3 +32,4 @@
 net_if_ioctls.diff
 vmpage_h_include
 compiler_membar.diff
+containerof.diff