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

stevenc-guest at alioth.debian.org stevenc-guest at alioth.debian.org
Sat Mar 5 03:28:06 UTC 2016


Author: stevenc-guest
Date: 2016-03-05 03:28:06 +0000 (Sat, 05 Mar 2016)
New Revision: 5903

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
   trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff
   trunk/kfreebsd-kernel-headers/debian/patches/compiler_membar.diff
   trunk/kfreebsd-kernel-headers/debian/patches/containerof.diff
   trunk/kfreebsd-kernel-headers/debian/patches/net_if_ioctls.diff
   trunk/kfreebsd-kernel-headers/debian/patches/queue_collision.diff
Log:
Refresh patches:
- queue_collision.diff
- 000_bruno_haible.diff
- 009_inetutils.diff
- net_if_ioctls.diff
- compiler_membar.diff
- containerof.diff


Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2016-03-05 03:24:20 UTC (rev 5902)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2016-03-05 03:28:06 UTC (rev 5903)
@@ -1,6 +1,13 @@
 kfreebsd-kernel-headers (10.3~1) UNRELEASED; urgency=medium
 
   * New upstream version
+  * Refresh patches:
+    - queue_collision.diff
+    - 000_bruno_haible.diff
+    - 009_inetutils.diff
+    - net_if_ioctls.diff
+    - compiler_membar.diff
+    - containerof.diff
   * Remove obsolete sys/netinet/in_gif.h
 
  -- Steven Chamberlain <steven at pyro.eu.org>  Sat, 05 Mar 2016 03:06:35 +0000

Modified: trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff	2016-03-05 03:24:20 UTC (rev 5902)
+++ trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff	2016-03-05 03:28:06 UTC (rev 5903)
@@ -49,7 +49,7 @@
  /*
   * Address Resolution Protocol.
   *
-@@ -75,6 +80,15 @@ struct	arphdr {
+@@ -75,6 +80,15 @@
  
  #define ar_sha(ap)	(((caddr_t)((ap)+1)) +   0)
  #define ar_spa(ap)	(((caddr_t)((ap)+1)) +   (ap)->ar_hln)
@@ -78,7 +78,7 @@
  /*
   * A Link-Level Sockaddr may specify the interface in one of two
   * ways: either by means of a system-provided index number (computed
-@@ -69,15 +73,9 @@ struct sockaddr_dl {
+@@ -69,15 +73,9 @@
  #define LLADDR(s) ((caddr_t)((s)->sdl_data + (s)->sdl_nlen))
  #define LLINDEX(s) ((s)->sdl_index)
  
@@ -134,7 +134,7 @@
  	u_int8_t book_version	:4;
 --- a/sys/sys/filedesc.h
 +++ b/sys/sys/filedesc.h
-@@ -63,7 +63,7 @@ struct filedescent {
+@@ -66,7 +66,7 @@
   * This structure is used for the management of descriptors.  It may be
   * shared by multiple processes.
   */
@@ -145,7 +145,7 @@
  	struct	filedescent *fd_ofiles;	/* open files */
 --- a/sys/sys/jail.h
 +++ b/sys/sys/jail.h
-@@ -39,6 +39,10 @@ struct jail_v0 {
+@@ -39,6 +39,10 @@
  };
  #endif
  
@@ -156,7 +156,7 @@
  struct jail {
  	uint32_t	version;
  	char		*path;
-@@ -108,11 +112,13 @@ struct xprison {
+@@ -108,11 +112,13 @@
  
  struct iovec;
  
@@ -177,7 +177,7 @@
  
 --- a/sys/sys/linker.h
 +++ b/sys/sys/linker.h
-@@ -185,6 +185,13 @@ int linker_search_symbol_name(caddr_t va
+@@ -185,6 +185,13 @@
  /* HWPMC helper */
  void *linker_hwpmc_list_objects(void);
  
@@ -191,7 +191,7 @@
  #endif	/* _KERNEL */
  
  /*
-@@ -332,14 +339,14 @@ struct kld_sym_lookup {
+@@ -332,14 +339,14 @@
  #include <sys/cdefs.h>
  
  __BEGIN_DECLS
@@ -248,10 +248,10 @@
  #define PCI_MAXNAMELEN	16
 --- a/sys/sys/procfs.h
 +++ b/sys/sys/procfs.h
-@@ -89,4 +89,8 @@ typedef struct thrmisc {
+@@ -112,4 +112,8 @@
+ };
+ #endif /* __HAVE_REG32 */
  
- typedef uint64_t psaddr_t;	/* An address in the target process. */
- 
 +/* We don't have any differences between processes and threads,
 +   therefore have only one PID type.  */
 +typedef __pid_t lwpid_t;
@@ -289,7 +289,7 @@
  /*
   * Scheduling class information.
   */
-@@ -79,14 +82,15 @@ struct thread;
+@@ -79,14 +82,15 @@
  int	rtp_to_pri(struct rtprio *, struct thread *);
  void	pri_to_rtp(struct thread *, struct rtprio *);
  #endif
@@ -320,7 +320,7 @@
  /*
   * Logical process signal actions and state, needed only within the process
   * The mapping between sigacts and proc structures is 1:1 except for rfork()
-@@ -93,6 +96,7 @@ struct osigaction {
+@@ -93,6 +96,7 @@
  typedef void __osiginfohandler_t(int, osiginfo_t *, void *);
  #endif /* COMPAT_43 */
  
@@ -328,7 +328,7 @@
  /* additional signal action values, used only temporarily/internally */
  #define	SIG_CATCH	((__sighandler_t *)2)
  /* #define SIG_HOLD        ((__sighandler_t *)3) See signal.h */
-@@ -181,7 +185,7 @@ __sigisempty(sigset_t *set)
+@@ -181,7 +185,7 @@
  	int i;
  
  	for (i = 0; i < _SIG_WORDS; i++) {
@@ -337,7 +337,7 @@
  			return (0);
  	}
  	return (1);
-@@ -193,7 +197,7 @@ __sigseteq(sigset_t *set1, sigset_t *set
+@@ -193,7 +197,7 @@
  	int i;
  
  	for (i = 0; i < _SIG_WORDS; i++) {
@@ -346,7 +346,7 @@
  			return (0);
  	}
  	return (1);
-@@ -208,6 +212,8 @@ struct osigevent {
+@@ -208,6 +212,8 @@
  	union sigval sigev_value;	/* Signal value */
  };
  
@@ -465,7 +465,7 @@
  
  struct thread;
  /*
-@@ -728,9 +827,15 @@ struct sbuf *sbuf_new_for_sysctl(struct
+@@ -801,9 +900,15 @@
  #include <sys/cdefs.h>
  
  __BEGIN_DECLS
@@ -486,7 +486,7 @@
  
 --- a/sys/sys/timex.h
 +++ b/sys/sys/timex.h
-@@ -221,19 +221,4 @@ struct timex {
+@@ -221,19 +221,4 @@
  	long	stbcnt;		/* stability limit exceeded (ro) */
  };
  
@@ -597,7 +597,7 @@
  	unsigned char	arp_tpa[4];	/* target protocol address */
  };
  #define	arp_hrd	ea_hdr.ar_hrd
-@@ -91,9 +90,8 @@ struct	ether_arp {
+@@ -91,9 +90,8 @@
  
  #ifndef BURN_BRIDGES	/* Can be used by third party software. */
  struct sockaddr_inarp {
@@ -609,7 +609,7 @@
  	struct	in_addr sin_addr;
  	struct	in_addr sin_srcaddr;
  	unsigned short	sin_tos;
-@@ -108,9 +106,11 @@ struct sockaddr_inarp {
+@@ -108,9 +106,11 @@
  #define	RTF_USETRAILERS	RTF_PROTO1	/* use trailers */
  #define RTF_ANNOUNCE	RTF_PROTO2	/* announce new arp entry */
  
@@ -623,7 +623,7 @@
  
  struct llentry;
  struct ifaddr;
-@@ -123,5 +123,3 @@ void	arp_ifinit(struct ifnet *, struct i
+@@ -123,5 +123,3 @@
  void	arp_ifinit2(struct ifnet *, struct ifaddr *, unsigned char *);
  void	arp_ifscrub(struct ifnet *, uint32_t);
  #endif

Modified: trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff	2016-03-05 03:24:20 UTC (rev 5902)
+++ trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff	2016-03-05 03:28:06 UTC (rev 5903)
@@ -30,7 +30,7 @@
  #include <sys/sx.h>		/* XXX */
  #include <sys/event.h>		/* XXX */
  #include <sys/_task.h>
-@@ -790,8 +793,19 @@
+@@ -833,8 +836,19 @@
   */
  struct ifaddr {
  	struct	sockaddr *ifa_addr;	/* address of interface */

Modified: trunk/kfreebsd-kernel-headers/debian/patches/compiler_membar.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/compiler_membar.diff	2016-03-05 03:24:20 UTC (rev 5902)
+++ trunk/kfreebsd-kernel-headers/debian/patches/compiler_membar.diff	2016-03-05 03:28:06 UTC (rev 5903)
@@ -30,7 +30,7 @@
  #define	rmb()	__asm __volatile("lock; addl $0,(%%esp)" : : : "memory", "cc")
 --- a/sys/x86/include/bus.h
 +++ b/sys/x86/include/bus.h
-@@ -1037,7 +1037,7 @@
+@@ -1020,7 +1020,7 @@
  		__asm __volatile("lock; addl $0,0(%%esp)" : : : "memory");
  #endif
  	else

Modified: trunk/kfreebsd-kernel-headers/debian/patches/containerof.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/containerof.diff	2016-03-05 03:24:20 UTC (rev 5902)
+++ trunk/kfreebsd-kernel-headers/debian/patches/containerof.diff	2016-03-05 03:28:06 UTC (rev 5903)
@@ -9,7 +9,7 @@
 
 --- a/sys/fs/devfs/devfs_int.h
 +++ b/sys/fs/devfs/devfs_int.h
-@@ -69,7 +69,7 @@
+@@ -70,7 +70,7 @@
  	LIST_HEAD(, cdev_privdata) cdp_fdpriv;
  };
  

Modified: trunk/kfreebsd-kernel-headers/debian/patches/net_if_ioctls.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/net_if_ioctls.diff	2016-03-05 03:24:20 UTC (rev 5902)
+++ trunk/kfreebsd-kernel-headers/debian/patches/net_if_ioctls.diff	2016-03-05 03:28:06 UTC (rev 5903)
@@ -49,16 +49,16 @@
  /* 
   * Structure used to retrieve aux status data from interfaces.
   * Kernel suppliers to this interface should respect the formatting
-@@ -521,8 +533,6 @@
- 	struct	sockaddr_storage dstaddr; /* out */
- };
+@@ -534,8 +546,6 @@
+ 	uint8_t data[8];	/* read buffer */
+ }; 
  
 -#endif /* __BSD_VISIBLE */
 -
  #ifdef _KERNEL
  #ifdef MALLOC_DECLARE
  MALLOC_DECLARE(M_IFADDR);
-@@ -549,4 +559,6 @@
+@@ -562,4 +572,6 @@
  #include <net/if_var.h>
  #endif
  

Modified: trunk/kfreebsd-kernel-headers/debian/patches/queue_collision.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/queue_collision.diff	2016-03-05 03:24:20 UTC (rev 5902)
+++ trunk/kfreebsd-kernel-headers/debian/patches/queue_collision.diff	2016-03-05 03:28:06 UTC (rev 5903)
@@ -1,7 +1,7 @@
 --- a/sys/sys/queue.h
 +++ b/sys/sys/queue.h
-@@ -257,8 +257,10 @@
- 	struct type **stqh_last;/* addr of last next element */		\
+@@ -284,8 +284,10 @@
+ 	class type **stqh_last;	/* addr of last next element */		\
  }
  
 +#if defined(__FreeBSD__) || defined(_KERNEL)
@@ -11,7 +11,7 @@
  
  #define	STAILQ_ENTRY(type)						\
  struct {								\
-@@ -533,8 +535,10 @@
+@@ -587,8 +589,10 @@
  }
  #endif
  




More information about the Glibc-bsd-commits mailing list