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

Petr Salinger ps-guest at alioth.debian.org
Wed Nov 29 11:36:57 CET 2006 

Author: ps-guest
Date: 2006-11-29 11:36:56 +0100 (Wed, 29 Nov 2006)
New Revision: 1754

Added:
   trunk/kfreebsd-kernel-headers/debian/patches/028_fbio.diff
Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
   trunk/kfreebsd-kernel-headers/debian/patches/012_strace.diff
   trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff
   trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff
Log:
 kfreebsd-kernel-headers
  * mini cleanup
  * fix <sys/fbio.h>, would be needed by fixed elinks



Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2006-11-29 08:48:43 UTC (rev 1753)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2006-11-29 10:36:56 UTC (rev 1754)
@@ -1,3 +1,11 @@
+kfreebsd-kernel-headers (0.23) UNRELEASED; urgency=low
+
+  [ Petr Salinger ]
+  * mini cleanup
+  * fix <sys/fbio.h>, would be needed by fixed elinks
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Wed, 22 Nov 2006 14:53:41 +0100
+
 kfreebsd-kernel-headers (0.22) unreleased; urgency=low
 
   [ Petr Salinger ]

Modified: trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff	2006-11-29 08:48:43 UTC (rev 1753)
+++ trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff	2006-11-29 10:36:56 UTC (rev 1754)
@@ -766,7 +766,7 @@
  #ifndef VM_H
  #define VM_H
  
-+#include <sys/types.h>
++#include <sys/_types.h>
 +
  typedef char vm_inherit_t;	/* inheritance codes */
  

Modified: trunk/kfreebsd-kernel-headers/debian/patches/012_strace.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/012_strace.diff	2006-11-29 08:48:43 UTC (rev 1753)
+++ trunk/kfreebsd-kernel-headers/debian/patches/012_strace.diff	2006-11-29 10:36:56 UTC (rev 1754)
@@ -9,18 +9,14 @@
  
  union	savefpu {
  	struct	save87	sv_87;
---- sys/sys/proc.h~	2004-12-07 23:53:09.000000000 +0100
-+++ sys/sys/proc.h	2004-12-08 02:03:24.000000000 +0100
-@@ -315,10 +321,10 @@
- 	struct callout	td_slpcallout;	/* (h) Callout for sleep. */
- 	struct trapframe *td_frame;	/* (k) */
- 	struct vm_object *td_kstack_obj;/* (a) Kstack object. */
--	vm_offset_t	td_kstack;	/* (a) Kernel VA of kstack. */
-+	__vm_offset_t	td_kstack;	/* (a) Kernel VA of kstack. */
- 	int		td_kstack_pages; /* (a) Size of the kstack. */
- 	struct vm_object *td_altkstack_obj;/* (a) Alternate kstack object. */
--	vm_offset_t	td_altkstack;	/* (a) Kernel VA of alternate kstack. */
-+	__vm_offset_t	td_altkstack;	/* (a) Kernel VA of alternate kstack. */
- 	int		td_altkstack_pages; /* (a) Size of alternate kstack. */
- 	u_int		td_critnest;	/* (k) Critical section nest level. */
- 	struct mdthread td_md;		/* (k) Any machine-dependent fields. */
+--- sys/amd64/include/fpu.h~	2006-03-01 20:30:51.000000000 +0100
++++ sys/amd64/include/fpu.h	2006-03-29 20:27:45.000000000 +0200
+@@ -71,7 +71,7 @@
+ 	} sv_fp[8];
+ 	struct xmmacc	sv_xmm[16];
+ 	u_char sv_pad[96];
+-} __aligned(16);
++} __attribute__((aligned(16)));
+ 
+ /*
+  * The hardware default control word for i387's and later coprocessors is

Modified: trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff	2006-11-29 08:48:43 UTC (rev 1753)
+++ trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff	2006-11-29 10:36:56 UTC (rev 1754)
@@ -6,7 +6,7 @@
  #define UPACKED __attribute__ ((packed))
  #else
 -#define UPACKED __packed
-+#define UPACKED
++#define UPACKED __attribute__ ((__packed__))
  #endif
  
  typedef struct {

Modified: trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff	2006-11-29 08:48:43 UTC (rev 1753)
+++ trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff	2006-11-29 10:36:56 UTC (rev 1754)
@@ -12,12 +12,11 @@
 diff -ur sys.old/i386/include/md_var.h sys/i386/include/md_var.h
 --- sys.old/i386/include/md_var.h	2005-08-17 16:32:52.000000000 +0200
 +++ sys/i386/include/md_var.h	2005-08-22 23:13:47.000000000 +0200
-@@ -32,6 +32,9 @@
+@@ -32,6 +32,8 @@
  #ifndef _MACHINE_MD_VAR_H_
  #define	_MACHINE_MD_VAR_H_
  
-+#include <machine/_types.h>
-+typedef __vm_paddr_t vm_paddr_t;
++#include <sys/_types.h>
 +
  /*
   * Miscellaneous machine-dependent declarations.
@@ -25,12 +24,11 @@
 diff -ur sys.old/amd64/include/md_var.h sys/amd64/include/md_var.h
 --- sys/amd64/include/md_var.h.old	2006-03-29 19:51:08.000000000 +0200
 +++ sys/amd64/include/md_var.h	2006-03-29 19:51:13.000000000 +0200
-@@ -32,6 +32,9 @@
+@@ -32,6 +32,8 @@
  #ifndef _MACHINE_MD_VAR_H_
  #define	_MACHINE_MD_VAR_H_
  
-+#include <machine/_types.h>
-+typedef __vm_paddr_t vm_paddr_t;
++#include <sys/_types.h>
 +
  /*
   * Miscellaneous machine-dependent declarations.
@@ -142,26 +140,3 @@
  
  #if __BSD_VISIBLE
  #define	TIMEVAL_TO_TIMESPEC(tv, ts)					\
-diff -ur sys.old/vm/vm.h sys/vm/vm.h
---- sys.old/vm/vm.h	2005-08-22 23:11:05.000000000 +0200
-+++ sys/vm/vm.h	2005-08-22 23:13:48.000000000 +0200
-@@ -62,6 +62,8 @@
- #define VM_H
- 
- #include <sys/types.h>
-+#include <machine/_types.h>
-+typedef __vm_offset_t vm_offset_t;
- 
- typedef char vm_inherit_t;	/* inheritance codes */
- 
---- sys/amd64/include/fpu.h~	2006-03-01 20:30:51.000000000 +0100
-+++ sys/amd64/include/fpu.h	2006-03-29 20:27:45.000000000 +0200
-@@ -71,7 +71,7 @@
- 	} sv_fp[8];
- 	struct xmmacc	sv_xmm[16];
- 	u_char sv_pad[96];
--} __aligned(16);
-+} __attribute__((aligned(16)));
- 
- /*
-  * The hardware default control word for i387's and later coprocessors is

Added: trunk/kfreebsd-kernel-headers/debian/patches/028_fbio.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/028_fbio.diff	2006-11-29 08:48:43 UTC (rev 1753)
+++ trunk/kfreebsd-kernel-headers/debian/patches/028_fbio.diff	2006-11-29 10:36:56 UTC (rev 1754)
@@ -0,0 +1,11 @@
+--- sys/sys/fbio.h~	2006-11-29 10:35:33.000000000 +0100
++++ sys/sys/fbio.h	2006-11-29 10:35:33.000000000 +0100
+@@ -39,7 +39,7 @@
+ #define _SYS_FBIO_H_
+ 
+ #ifndef _KERNEL
+-#include <sys/types.h>
++#include <sys/_types.h>
+ #endif
+ #include <sys/ioccom.h>
+

More information about the Glibc-bsd-commits mailing list