[Glibc-bsd-commits] r5631 - in trunk/kfreebsd-kernel-headers: debian debian/patches test

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2014-10-12 01:07:25 +0000 (Sun, 12 Oct 2014)
New Revision: 5631

Added:
   trunk/kfreebsd-kernel-headers/debian/patches/sys_counter.diff
   trunk/kfreebsd-kernel-headers/test/net_route.c
Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/patches/series
   trunk/kfreebsd-kernel-headers/test/Makefile
Log:
* Make net/route.h compilable again in userland, by including
  necessary kernel types in sys/counter.h (Closes: #764897)
  - add net_route.c testcase


Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2014-10-10 23:10:07 UTC (rev 5630)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2014-10-12 01:07:25 UTC (rev 5631)
@@ -1,3 +1,11 @@
+kfreebsd-kernel-headers (10.1~5) UNRELEASED; urgency=medium
+
+  * Make net/route.h compilable again in userland, by including
+    necessary kernel types in sys/counter.h (Closes: #764897)
+    - add net_route.c testcase
+
+ -- Steven Chamberlain <steven at pyro.eu.org>  Sun, 12 Oct 2014 01:33:11 +0100
+
 kfreebsd-kernel-headers (10.1~4) unstable; urgency=low
 
   [ Petr Salinger ]

Modified: trunk/kfreebsd-kernel-headers/debian/patches/series
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/series	2014-10-10 23:10:07 UTC (rev 5630)
+++ trunk/kfreebsd-kernel-headers/debian/patches/series	2014-10-12 01:07:25 UTC (rev 5631)
@@ -33,3 +33,4 @@
 vmpage_h_include
 compiler_membar.diff
 containerof.diff
+sys_counter.diff

Added: trunk/kfreebsd-kernel-headers/debian/patches/sys_counter.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/sys_counter.diff	                        (rev 0)
+++ trunk/kfreebsd-kernel-headers/debian/patches/sys_counter.diff	2014-10-12 01:07:25 UTC (rev 5631)
@@ -0,0 +1,10 @@
+--- a/sys/sys/counter.h
++++ b/sys/sys/counter.h
+@@ -29,6 +29,7 @@
+ #ifndef __SYS_COUNTER_H__
+ #define __SYS_COUNTER_H__
+ 
++#include <sys/kglue/sys/types.h>	/* for uint64_t */
+ typedef uint64_t *counter_u64_t;
+ 
+ #ifdef _KERNEL

Modified: trunk/kfreebsd-kernel-headers/test/Makefile
===================================================================
--- trunk/kfreebsd-kernel-headers/test/Makefile	2014-10-10 23:10:07 UTC (rev 5630)
+++ trunk/kfreebsd-kernel-headers/test/Makefile	2014-10-12 01:07:25 UTC (rev 5631)
@@ -22,6 +22,7 @@
 	ino_t.o \
 	limits.o \
 	net_if.o \
+	net_route.o \
 	ppp.o \
 	sctp.o \
 	soundcard.o \

Added: trunk/kfreebsd-kernel-headers/test/net_route.c
===================================================================
--- trunk/kfreebsd-kernel-headers/test/net_route.c	                        (rev 0)
+++ trunk/kfreebsd-kernel-headers/test/net_route.c	2014-10-12 01:07:25 UTC (rev 5631)
@@ -0,0 +1,5 @@
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/socket.h>
+#include <net/if.h>
+#include <net/route.h>