[Glibc-bsd-commits] r1534 - trunk/kfreebsd-kernel-headers/debian/patches

[Petr Salinger]

Author: ps-guest
Date: 2006-05-02 13:54:06 +0000 (Tue, 02 May 2006)
New Revision: 1534

Modified:
   trunk/kfreebsd-kernel-headers/debian/patches/012_strace.diff
   trunk/kfreebsd-kernel-headers/debian/patches/018_sys__types.diff
Log:
* drop complementary patch hunks


Modified: trunk/kfreebsd-kernel-headers/debian/patches/012_strace.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/012_strace.diff	2006-05-02 13:41:36 UTC (rev 1533)
+++ trunk/kfreebsd-kernel-headers/debian/patches/012_strace.diff	2006-05-02 13:54:06 UTC (rev 1534)
@@ -11,19 +11,6 @@
  	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
-@@ -61,6 +61,12 @@
- 
- #include <machine/proc.h>		/* Machine-dependent proc substruct. */
- 
-+#ifdef __FreeBSD__
-+#include <sys/types.h>			/* vm_offset_t */
-+#else
-+#include <machine/_types.h>		/* __vm_offset_t */
-+#endif
-+
- /*
-  * One structure allocated per session.
-  *
 @@ -315,10 +321,10 @@
  	struct callout	td_slpcallout;	/* (h) Callout for sleep. */
  	struct trapframe *td_frame;	/* (k) */

Modified: trunk/kfreebsd-kernel-headers/debian/patches/018_sys__types.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/018_sys__types.diff	2006-05-02 13:41:36 UTC (rev 1533)
+++ trunk/kfreebsd-kernel-headers/debian/patches/018_sys__types.diff	2006-05-02 13:54:06 UTC (rev 1534)
@@ -70,15 +70,3 @@
  #include <sys/callout.h>		/* For struct callout. */
  #include <sys/event.h>			/* For struct klist. */
  #ifndef _KERNEL
-@@ -61,11 +62,6 @@
- 
- #include <machine/proc.h>		/* Machine-dependent proc substruct. */
- 
--#ifdef __FreeBSD__
--#include <sys/types.h>			/* vm_offset_t */
--#else
--#include <machine/_types.h>		/* __vm_offset_t */
--#endif
- 
- /*
-  * One structure allocated per session.