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

[ps-guest at alioth.debian.org]

Author: ps-guest
Date: 2009-01-05 10:58:12 +0000 (Mon, 05 Jan 2009)
New Revision: 2334

Added:
   trunk/kfreebsd-kernel-headers/debian/patches/033_pcpu.diff
Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/control
   trunk/kfreebsd-kernel-headers/debian/includes.list
   trunk/kfreebsd-kernel-headers/debian/patches/018_sys__types.diff
   trunk/kfreebsd-kernel-headers/debian/patches/series
   trunk/kfreebsd-kernel-headers/debian/rules
Log:
* kfreebsd-kernel-headers based on kfreebsd-source-7.1


Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2009-01-04 12:42:39 UTC (rev 2333)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2009-01-05 10:58:12 UTC (rev 2334)
@@ -1,3 +1,11 @@
+kfreebsd-kernel-headers (0.31) unreleased; urgency=low
+
+  [ Petr Salinger ]
+  * Based on kfreebsd-source-7.1
+  * debian/includes.list: update for kfreebsd-7.1
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon, 05 Jan 2009 10:15:55 +0100
+
 kfreebsd-kernel-headers (0.30) unreleased; urgency=low
 
   * debian/patches/*: convert to patchlevel p1 as requested by the new

Modified: trunk/kfreebsd-kernel-headers/debian/control
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/control	2009-01-04 12:42:39 UTC (rev 2333)
+++ trunk/kfreebsd-kernel-headers/debian/control	2009-01-05 10:58:12 UTC (rev 2334)
@@ -3,7 +3,7 @@
 Priority: standard
 Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
 Uploaders: Aurelien Jarno <aurel32 at debian.org>, Guillem Jover <guillem at debian.org>
-Build-Depends: debhelper (>= 4.1.0), quilt, kfreebsd-source-7.0
+Build-Depends: debhelper (>= 4.1.0), quilt, kfreebsd-source-7.1
 Standards-Version: 3.8.0
 
 Package: kfreebsd-kernel-headers

Modified: trunk/kfreebsd-kernel-headers/debian/includes.list
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/includes.list	2009-01-04 12:42:39 UTC (rev 2333)
+++ trunk/kfreebsd-kernel-headers/debian/includes.list	2009-01-05 10:58:12 UTC (rev 2334)
@@ -14,7 +14,6 @@
 netatalk/ddp_var.h
 netatalk/endian.h
 netatalk/phase2.h
-netatm
 net/bpf.h
 netgraph
 net/bridgestp.h
@@ -178,6 +177,7 @@
 sys/nlist_aout.h
 sys/_null.h
 sys/pciio.h
+sys/pcpu.h
 sys/pioctl.h
 sys/pipe.h
 sys/posix4.h

Modified: trunk/kfreebsd-kernel-headers/debian/patches/018_sys__types.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/018_sys__types.diff	2009-01-04 12:42:39 UTC (rev 2333)
+++ trunk/kfreebsd-kernel-headers/debian/patches/018_sys__types.diff	2009-01-05 10:58:12 UTC (rev 2334)
@@ -52,7 +52,7 @@
 +typedef	__segsz_t	segsz_t;	/* segment size (in pages) */
 +
 +typedef	__u_register_t	u_register_t;
-+
++typedef	__cpumask_t	cpumask_t;
 +typedef	__vm_offset_t	vm_offset_t;
 +typedef	__vm_ooffset_t	vm_ooffset_t;
 +typedef	__vm_paddr_t	vm_paddr_t;

Added: trunk/kfreebsd-kernel-headers/debian/patches/033_pcpu.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/033_pcpu.diff	                        (rev 0)
+++ trunk/kfreebsd-kernel-headers/debian/patches/033_pcpu.diff	2009-01-05 10:58:12 UTC (rev 2334)
@@ -0,0 +1,20 @@
+--- src/sys/sys/pcpu.h~
++++ src/sys/sys/pcpu.h
+@@ -41,6 +41,8 @@
+ #include <sys/vmmeter.h>
+ #include <sys/resource.h>
+ #include <machine/pcpu.h>
++#include <sys/_types.h>
++#include <stdint.h>
+ 
+ struct pcb;
+ struct thread;
+@@ -57,7 +59,7 @@
+ 	struct thread	*pc_fpcurthread;	/* Fp state owner */
+ 	struct thread	*pc_deadthread;		/* Zombie thread or NULL */
+ 	struct pcb	*pc_curpcb;		/* Current pcb */
+-	uint64_t	pc_switchtime;
++	u_int64_t	pc_switchtime;
+ 	int		pc_switchticks;
+ 	u_int		pc_cpuid;		/* This cpu number */
+ 	cpumask_t	pc_cpumask;		/* This cpu mask */

Modified: trunk/kfreebsd-kernel-headers/debian/patches/series
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/series	2009-01-04 12:42:39 UTC (rev 2333)
+++ trunk/kfreebsd-kernel-headers/debian/patches/series	2009-01-05 10:58:12 UTC (rev 2334)
@@ -27,3 +27,4 @@
 030_pfvar.diff -p1
 031_ufs.diff -p1
 032_vnode.diff -p1
+033_pcpu.diff -p1

Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules	2009-01-04 12:42:39 UTC (rev 2333)
+++ trunk/kfreebsd-kernel-headers/debian/rules	2009-01-05 10:58:12 UTC (rev 2334)
@@ -8,8 +8,8 @@
 kfreebsd_cpu	:= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 
 HEADERS_PACKAGE	:= $(CURDIR)/debian/kfreebsd-kernel-headers
-SRC_TAR		:= /usr/src/kfreebsd-source-7.0.tar.bz2
-SRC_DIR		:= kfreebsd-source-7.0
+SRC_TAR		:= /usr/src/kfreebsd-source-7.1.tar.bz2
+SRC_DIR		:= kfreebsd-source-7.1
 
 clean:
 	dh_testdir