[Glibc-bsd-commits] r2826 - in trunk/kfreebsd-kernel-headers/debian: . patches
Petr Salinger
ps-guest at alioth.debian.org
Fri Nov 13 13:38:14 UTC 2009
Author: ps-guest
Date: 2009-11-13 13:38:14 +0000 (Fri, 13 Nov 2009)
New Revision: 2826
Modified:
trunk/kfreebsd-kernel-headers/debian/changelog
trunk/kfreebsd-kernel-headers/debian/control
trunk/kfreebsd-kernel-headers/debian/install
trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
trunk/kfreebsd-kernel-headers/debian/patches/003_osreldate.diff
trunk/kfreebsd-kernel-headers/debian/patches/006_sys_tty_h.diff
trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff
trunk/kfreebsd-kernel-headers/debian/patches/011_wine.diff
trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff
trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff
trunk/kfreebsd-kernel-headers/debian/patches/020_concat_elf_generic.diff
trunk/kfreebsd-kernel-headers/debian/patches/021_machine__types.diff
trunk/kfreebsd-kernel-headers/debian/patches/023_packed.diff
trunk/kfreebsd-kernel-headers/debian/patches/029_conf.diff
trunk/kfreebsd-kernel-headers/debian/patches/series
trunk/kfreebsd-kernel-headers/debian/rules
Log:
preliminary kfreebsd-kernel-headers based on 8.0
Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog 2009-11-13 11:29:15 UTC (rev 2825)
+++ trunk/kfreebsd-kernel-headers/debian/changelog 2009-11-13 13:38:14 UTC (rev 2826)
@@ -1,3 +1,11 @@
+kfreebsd-kernel-headers (0.43) EXPERIMENTAL; urgency=low
+
+ [ Petr Salinger ]
+ * Based on kfreebsd-source-8.0
+ * debian/includes.list: update for kfreebsd-8.0
+
+ -- Aurelien Jarno <aurel32 at debian.org> Fri, 13 Nov 2009 14:31:07 +0100
+
kfreebsd-kernel-headers (0.42) unstable; urgency=low
[ John Stamp ]
Modified: trunk/kfreebsd-kernel-headers/debian/control
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/control 2009-11-13 11:29:15 UTC (rev 2825)
+++ trunk/kfreebsd-kernel-headers/debian/control 2009-11-13 13:38:14 UTC (rev 2826)
@@ -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>, Cyril Brulebois <kibi at debian.org>
-Build-Depends: debhelper (>= 5.0.0), quilt, kfreebsd-source-7.2
+Build-Depends: debhelper (>= 5.0.0), quilt, kfreebsd-source-8.0
Vcs-Browser: http://svn.debian.org/wsvn/glibc-bsd/trunk/kfreebsd-kernel-headers/
Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/kfreebsd-kernel-headers/
Standards-Version: 3.8.3
Modified: trunk/kfreebsd-kernel-headers/debian/install
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/install 2009-11-13 11:29:15 UTC (rev 2825)
+++ trunk/kfreebsd-kernel-headers/debian/install 2009-11-13 13:38:14 UTC (rev 2826)
@@ -67,9 +67,6 @@
sys/net/if_llc.h usr/include/net
sys/net/if_media.h usr/include/net
sys/net/if_mib.h usr/include/net
-sys/net/if_ppp.h usr/include/net
-sys/net/if_pppvar.h usr/include/net
-sys/net/if_slvar.h usr/include/net
sys/net/if_sppp.h usr/include/net
sys/net/if_stf.h usr/include/net
sys/net/if_tap.h usr/include/net
@@ -81,13 +78,10 @@
sys/net/iso88025.h usr/include/net
sys/net/netisr.h usr/include/net
sys/net/pfkeyv2.h usr/include/net
-sys/net/ppp_comp.h usr/include/net
-sys/net/ppp_defs.h usr/include/net
sys/net/radix.h usr/include/net
sys/net/raw_cb.h usr/include/net
sys/net/route.h usr/include/net
sys/net/slcompress.h usr/include/net
-sys/net/slip.h usr/include/net
sys/net/zlib.h usr/include/net
sys/netatalk/aarp.h usr/include/netatalk
sys/netatalk/at_extern.h usr/include/netatalk
@@ -130,7 +124,6 @@
sys/netinet/ip_encap.h usr/include/netinet
sys/netinet/ip_fw.h usr/include/netinet
sys/netinet/ip_mroute.h usr/include/netinet
-sys/netinet/ipprotosw.h usr/include/netinet
sys/netinet/ip_var.h usr/include/netinet
sys/netinet/tcp_debug.h usr/include/netinet
sys/netinet/tcp_fsm.h usr/include/netinet
@@ -151,11 +144,9 @@
sys/netncp/*.h usr/include/netncp
sys/nfsclient/*.h usr/include/nfsclient
sys/nfs/nfsproto.h usr/include/nfs
-sys/nfs/rpcv2.h usr/include/nfs
sys/nfs/xdr_subs.h usr/include/nfs
sys/opencrypto/*.h usr/include/opencrypto
sys/osreldate.h usr/include/.
-sys/pccard/*.h usr/include/pccard
sys/sys/acct.h usr/include/sys
sys/sys/agpio.h usr/include/sys
sys/sys/assym.h usr/include/sys
@@ -170,7 +161,6 @@
sys/sys/cdio.h usr/include/sys
sys/sys/cdrio.h usr/include/sys
sys/sys/chio.h usr/include/sys
-sys/sys/clist.h usr/include/sys
sys/sys/condvar.h usr/include/sys
sys/sys/conf.h usr/include/sys
sys/sys/cons.h usr/include/sys
@@ -214,7 +204,6 @@
sys/sys/kenv.h usr/include/sys
sys/sys/kernel.h usr/include/sys
sys/sys/kobj.h usr/include/sys
-sys/sys/kse.h usr/include/sys
sys/sys/kthread.h usr/include/sys
sys/sys/ktrace.h usr/include/sys
sys/sys/ktr.h usr/include/sys
@@ -242,6 +231,7 @@
sys/sys/namei.h usr/include/sys
sys/sys/nlist_aout.h usr/include/sys
sys/sys/_null.h usr/include/sys
+sys/sys/osd.h usr/include/sys
sys/sys/pciio.h usr/include/sys
sys/sys/pcpu.h usr/include/sys
sys/sys/pioctl.h usr/include/sys
@@ -281,7 +271,6 @@
sys/sys/timex.h usr/include/sys
sys/sys/tree.h usr/include/sys
sys/sys/ttycom.h usr/include/sys
-sys/sys/ttydev.h usr/include/sys
sys/sys/tty.h usr/include/sys
sys/sys/_types.h usr/include/sys
sys/sys/ucred.h usr/include/sys
@@ -289,7 +278,6 @@
sys/sys/user.h usr/include/sys
sys/sys/vmmeter.h usr/include/sys
sys/sys/vnode.h usr/include/sys
-sys/sys/xrpuio.h usr/include/sys
sys/ufs/ffs/*.h usr/include/ufs/ffs
sys/ufs/ufs/*.h usr/include/ufs/ufs
sys/vm/*.h usr/include/vm
@@ -311,14 +299,11 @@
sys/dev/ale/*.h usr/include/dev/ale
sys/dev/amd/*.h usr/include/dev/amd
sys/dev/amr/*.h usr/include/dev/amr
-sys/dev/ar/*.h usr/include/dev/ar
sys/dev/arcmsr/*.h usr/include/dev/arcmsr
-sys/dev/arl/*.h usr/include/dev/arl
sys/dev/asr/*.h usr/include/dev/asr
sys/dev/ata/*.h usr/include/dev/ata
sys/dev/atkbdc/*.h usr/include/dev/atkbdc
sys/dev/auxio/*.h usr/include/dev/auxio
-sys/dev/awi/*.h usr/include/dev/awi
sys/dev/bce/*.h usr/include/dev/bce
sys/dev/bfe/*.h usr/include/dev/bfe
sys/dev/bge/*.h usr/include/dev/bge
@@ -329,7 +314,6 @@
sys/dev/ciss/*.h usr/include/dev/ciss
sys/dev/cm/*.h usr/include/dev/cm
sys/dev/cmx/*.h usr/include/dev/cmx
-sys/dev/cnw/*.h usr/include/dev/cnw
sys/dev/cp/*.h usr/include/dev/cp
sys/dev/cs/*.h usr/include/dev/cs
sys/dev/ct/*.h usr/include/dev/ct
@@ -421,13 +405,11 @@
sys/dev/puc/*.h usr/include/dev/puc
sys/dev/ral/*.h usr/include/dev/ral
sys/dev/random/*.h usr/include/dev/random
-sys/dev/ray/*.h usr/include/dev/ray
sys/dev/rc/*.h usr/include/dev/rc
sys/dev/rndtest/*.h usr/include/dev/rndtest
sys/dev/rp/*.h usr/include/dev/rp
sys/dev/safe/*.h usr/include/dev/safe
sys/dev/sbni/*.h usr/include/dev/sbni
-sys/dev/sbsh/*.h usr/include/dev/sbsh
sys/dev/scc/*.h usr/include/dev/scc
sys/dev/scd/*.h usr/include/dev/scd
sys/dev/sf/*.h usr/include/dev/sf
@@ -445,7 +427,6 @@
sys/dev/sound/sbus/*.h usr/include/dev/sound/sbus
sys/dev/sound/usb/*.h usr/include/dev/sound/usb
sys/dev/spibus/*.h usr/include/dev/spibus
-sys/dev/sr/*.h usr/include/dev/sr
sys/dev/stg/*.h usr/include/dev/stg
sys/dev/stge/*.h usr/include/dev/stge
sys/dev/sym/*.h usr/include/dev/sym
Modified: trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff 2009-11-13 11:29:15 UTC (rev 2825)
+++ trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff 2009-11-13 13:38:14 UTC (rev 2826)
@@ -1,7 +1,7 @@
-Index: src/sys/i386/include/npx.h
+Index: kfreebsd-source-8.0/sys/i386/include/npx.h
===================================================================
---- src/sys/i386/include/npx.h.orig
-+++ src/sys/i386/include/npx.h
+--- kfreebsd-source-8.0.orig/sys/i386/include/npx.h 2009-11-12 15:48:49.000000000 +0000
++++ kfreebsd-source-8.0/sys/i386/include/npx.h 2009-11-12 16:22:12.000000000 +0000
@@ -41,6 +41,8 @@
#ifndef _MACHINE_NPX_H_
#define _MACHINE_NPX_H_
@@ -11,10 +11,10 @@
/* Environment information of floating point unit */
struct env87 {
long en_cw; /* control word (16bits) */
-Index: src/sys/amd64/include/pcb.h
+Index: kfreebsd-source-8.0/sys/amd64/include/pcb.h
===================================================================
---- src/sys/amd64/include/pcb.h.orig
-+++ src/sys/amd64/include/pcb.h
+--- kfreebsd-source-8.0.orig/sys/amd64/include/pcb.h 2009-11-12 15:48:23.000000000 +0000
++++ kfreebsd-source-8.0/sys/amd64/include/pcb.h 2009-11-12 16:22:12.000000000 +0000
@@ -40,6 +40,7 @@
/*
* AMD64 process control block
@@ -23,10 +23,10 @@
#include <machine/fpu.h>
#include <machine/segments.h>
-Index: src/sys/i386/include/pcb.h
+Index: kfreebsd-source-8.0/sys/i386/include/pcb.h
===================================================================
---- src/sys/i386/include/pcb.h.orig
-+++ src/sys/i386/include/pcb.h
+--- kfreebsd-source-8.0.orig/sys/i386/include/pcb.h 2009-11-12 15:48:49.000000000 +0000
++++ kfreebsd-source-8.0/sys/i386/include/pcb.h 2009-11-12 16:22:12.000000000 +0000
@@ -36,6 +36,8 @@
#ifndef _I386_PCB_H_
#define _I386_PCB_H_
@@ -36,10 +36,10 @@
/*
* Intel 386 process control block
*/
-Index: src/sys/i386/include/pmap.h
+Index: kfreebsd-source-8.0/sys/i386/include/pmap.h
===================================================================
---- src/sys/i386/include/pmap.h.orig
-+++ src/sys/i386/include/pmap.h
+--- kfreebsd-source-8.0.orig/sys/i386/include/pmap.h 2009-11-12 15:48:49.000000000 +0000
++++ kfreebsd-source-8.0/sys/i386/include/pmap.h 2009-11-12 16:22:12.000000000 +0000
@@ -44,6 +44,13 @@
#ifndef _MACHINE_PMAP_H_
#define _MACHINE_PMAP_H_
@@ -54,10 +54,10 @@
/*
* Page-directory and page-table entries follow this format, with a few
* of the fields not present here and there, depending on a lot of things.
-Index: src/sys/net/if_arp.h
+Index: kfreebsd-source-8.0/sys/net/if_arp.h
===================================================================
---- src/sys/net/if_arp.h.orig
-+++ src/sys/net/if_arp.h
+--- kfreebsd-source-8.0.orig/sys/net/if_arp.h 2009-11-12 15:48:55.000000000 +0000
++++ kfreebsd-source-8.0/sys/net/if_arp.h 2009-11-12 16:22:12.000000000 +0000
@@ -33,6 +33,11 @@
#ifndef _NET_IF_ARP_H_
#define _NET_IF_ARP_H_
@@ -86,10 +86,10 @@
/*
* ARP ioctl request
*/
-Index: src/sys/net/if_dl.h
+Index: kfreebsd-source-8.0/sys/net/if_dl.h
===================================================================
---- src/sys/net/if_dl.h.orig
-+++ src/sys/net/if_dl.h
+--- kfreebsd-source-8.0.orig/sys/net/if_dl.h 2009-11-12 15:48:55.000000000 +0000
++++ kfreebsd-source-8.0/sys/net/if_dl.h 2009-11-12 16:22:12.000000000 +0000
@@ -33,6 +33,10 @@
#ifndef _NET_IF_DL_H_
#define _NET_IF_DL_H_
@@ -119,10 +119,10 @@
-#endif /* !_KERNEL */
-
#endif
-Index: src/sys/nfsclient/nfs.h
+Index: kfreebsd-source-8.0/sys/nfsclient/nfs.h
===================================================================
---- src/sys/nfsclient/nfs.h.orig
-+++ src/sys/nfsclient/nfs.h
+--- kfreebsd-source-8.0.orig/sys/nfsclient/nfs.h 2009-11-12 15:48:58.000000000 +0000
++++ kfreebsd-source-8.0/sys/nfsclient/nfs.h 2009-11-12 16:22:12.000000000 +0000
@@ -36,6 +36,11 @@
#ifndef _NFSCLIENT_NFS_H_
#define _NFSCLIENT_NFS_H_
@@ -135,10 +135,10 @@
#ifdef _KERNEL
#include "opt_nfs.h"
#endif
-Index: src/sys/sys/callout.h
+Index: kfreebsd-source-8.0/sys/sys/callout.h
===================================================================
---- src/sys/sys/callout.h.orig
-+++ src/sys/sys/callout.h
+--- kfreebsd-source-8.0.orig/sys/sys/callout.h 2009-11-12 15:49:02.000000000 +0000
++++ kfreebsd-source-8.0/sys/sys/callout.h 2009-11-12 16:22:12.000000000 +0000
@@ -38,6 +38,8 @@
#ifndef _SYS_CALLOUT_H_
#define _SYS_CALLOUT_H_
@@ -147,11 +147,11 @@
+
#include <sys/queue.h>
- struct mtx;
-Index: src/sys/sys/dvdio.h
+ struct lock_object;
+Index: kfreebsd-source-8.0/sys/sys/dvdio.h
===================================================================
---- src/sys/sys/dvdio.h.orig
-+++ src/sys/sys/dvdio.h
+--- kfreebsd-source-8.0.orig/sys/sys/dvdio.h 2009-11-12 15:49:02.000000000 +0000
++++ kfreebsd-source-8.0/sys/sys/dvdio.h 2009-11-12 16:22:12.000000000 +0000
@@ -31,6 +31,8 @@
#ifndef _SYS_DVDIO_H_
#define _SYS_DVDIO_H_
@@ -161,12 +161,12 @@
struct dvd_layer {
u_int8_t book_type :4;
u_int8_t book_version :4;
-Index: src/sys/sys/extattr.h
+Index: kfreebsd-source-8.0/sys/sys/extattr.h
===================================================================
---- src/sys/sys/extattr.h.orig
-+++ src/sys/sys/extattr.h
-@@ -67,36 +67,36 @@
- struct ucred *cred, struct thread *td, int access);
+--- kfreebsd-source-8.0.orig/sys/sys/extattr.h 2009-11-12 15:49:02.000000000 +0000
++++ kfreebsd-source-8.0/sys/sys/extattr.h 2009-11-12 16:22:12.000000000 +0000
+@@ -68,36 +68,36 @@
+ struct ucred *cred, struct thread *td, accmode_t accmode);
#else
-#include <sys/cdefs.h>
@@ -228,10 +228,10 @@
__END_DECLS
#endif /* !_KERNEL */
-Index: src/sys/sys/filedesc.h
+Index: kfreebsd-source-8.0/sys/sys/filedesc.h
===================================================================
---- src/sys/sys/filedesc.h.orig
-+++ src/sys/sys/filedesc.h
+--- kfreebsd-source-8.0.orig/sys/sys/filedesc.h 2009-11-12 15:49:02.000000000 +0000
++++ kfreebsd-source-8.0/sys/sys/filedesc.h 2009-11-12 16:22:12.000000000 +0000
@@ -33,6 +33,7 @@
#ifndef _SYS_FILEDESC_H_
#define _SYS_FILEDESC_H_
@@ -240,39 +240,45 @@
#include <sys/queue.h>
#include <sys/event.h>
#include <sys/lock.h>
-Index: src/sys/sys/jail.h
+Index: kfreebsd-source-8.0/sys/sys/jail.h
===================================================================
---- src/sys/sys/jail.h.orig
-+++ src/sys/sys/jail.h
-@@ -13,6 +13,10 @@
- #ifndef _SYS_JAIL_H_
- #define _SYS_JAIL_H_
+--- kfreebsd-source-8.0.orig/sys/sys/jail.h 2009-11-12 15:49:03.000000000 +0000
++++ kfreebsd-source-8.0/sys/sys/jail.h 2009-11-12 16:24:38.000000000 +0000
+@@ -39,6 +39,10 @@
+ };
+ #endif
+#include <features.h>
+
+#include <sys/types.h>
+
struct jail {
- u_int32_t version;
+ uint32_t version;
char *path;
-@@ -31,8 +35,10 @@
+@@ -108,11 +112,13 @@
- #ifndef _KERNEL
+ struct iovec;
-int jail(struct jail *);
+-int jail_set(struct iovec *, unsigned int, int);
+-int jail_get(struct iovec *, unsigned int, int);
-int jail_attach(int);
+-int jail_remove(int);
+__BEGIN_DECLS
+extern int jail(struct jail *) __THROW;
++extern int jail_set(struct iovec *, unsigned int, int) __THROW;
++extern int jail_get(struct iovec *, unsigned int, int) __THROW;
+extern int jail_attach(int) __THROW;
++extern int jail_remove(int) __THROW;
+__END_DECLS
#else /* _KERNEL */
-Index: src/sys/sys/linker.h
+Index: kfreebsd-source-8.0/sys/sys/linker.h
===================================================================
---- src/sys/sys/linker.h.orig
-+++ src/sys/sys/linker.h
-@@ -168,6 +168,13 @@
+--- kfreebsd-source-8.0.orig/sys/sys/linker.h 2009-11-12 15:49:03.000000000 +0000
++++ kfreebsd-source-8.0/sys/sys/linker.h 2009-11-12 16:22:12.000000000 +0000
+@@ -189,6 +189,13 @@
/* HWPMC helper */
void *linker_hwpmc_list_objects(void);
@@ -286,7 +292,7 @@
#endif /* _KERNEL */
/*
-@@ -283,14 +290,13 @@
+@@ -332,14 +339,13 @@
#include <sys/cdefs.h>
__BEGIN_DECLS
@@ -308,10 +314,10 @@
__END_DECLS
#endif
-Index: src/sys/sys/lock.h
+Index: kfreebsd-source-8.0/sys/sys/lock.h
===================================================================
---- src/sys/sys/lock.h.orig
-+++ src/sys/sys/lock.h
+--- kfreebsd-source-8.0.orig/sys/sys/lock.h 2009-11-12 15:49:03.000000000 +0000
++++ kfreebsd-source-8.0/sys/sys/lock.h 2009-11-12 16:22:12.000000000 +0000
@@ -32,6 +32,7 @@
#ifndef _SYS_LOCK_H_
#define _SYS_LOCK_H_
@@ -320,12 +326,12 @@
#include <sys/queue.h>
#include <sys/_lock.h>
-Index: src/sys/sys/memrange.h
+Index: kfreebsd-source-8.0/sys/sys/memrange.h
===================================================================
---- src/sys/sys/memrange.h.orig
-+++ src/sys/sys/memrange.h
+--- kfreebsd-source-8.0.orig/sys/sys/memrange.h 2009-11-12 15:49:03.000000000 +0000
++++ kfreebsd-source-8.0/sys/sys/memrange.h 2009-11-12 16:25:20.000000000 +0000
@@ -4,6 +4,11 @@
- * $FreeBSD: src/sys/sys/memrange.h,v 1.7 2004/08/04 18:30:31 markm Exp $
+ * $FreeBSD: src/sys/sys/memrange.h,v 1.8.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
+#ifndef _SYS_MEMRANGE_H_
@@ -336,15 +342,16 @@
/* Memory range attributes */
#define MDF_UNCACHEABLE (1<<0) /* region not cached */
#define MDF_WRITECOMBINE (1<<1) /* region supports "write combine" action */
-@@ -69,3 +74,4 @@
+@@ -69,3 +74,5 @@
+ extern int mem_range_attr_set(struct mem_range_desc *mrd, int *arg);
#endif
-
++
+#endif /* _SYS_MEMRANGE_H_ */
-Index: src/sys/sys/pciio.h
+Index: kfreebsd-source-8.0/sys/sys/pciio.h
===================================================================
---- src/sys/sys/pciio.h.orig
-+++ src/sys/sys/pciio.h
+--- kfreebsd-source-8.0.orig/sys/sys/pciio.h 2009-11-12 15:49:03.000000000 +0000
++++ kfreebsd-source-8.0/sys/sys/pciio.h 2009-11-12 16:22:12.000000000 +0000
@@ -31,6 +31,8 @@
#ifndef _SYS_PCIIO_H_
#define _SYS_PCIIO_H_
@@ -354,23 +361,23 @@
#include <sys/ioccom.h>
#define PCI_MAXNAMELEN 16
-Index: src/sys/sys/procfs.h
+Index: kfreebsd-source-8.0/sys/sys/procfs.h
===================================================================
---- src/sys/sys/procfs.h.orig
-+++ src/sys/sys/procfs.h
+--- kfreebsd-source-8.0.orig/sys/sys/procfs.h 2009-11-12 15:49:03.000000000 +0000
++++ kfreebsd-source-8.0/sys/sys/procfs.h 2009-11-12 16:22:12.000000000 +0000
@@ -82,4 +82,8 @@
- typedef void *psaddr_t; /* An address in the target process. */
+ 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;
+
#endif /* _SYS_PROCFS_H_ */
-Index: src/sys/sys/resourcevar.h
+Index: kfreebsd-source-8.0/sys/sys/resourcevar.h
===================================================================
---- src/sys/sys/resourcevar.h.orig
-+++ src/sys/sys/resourcevar.h
+--- kfreebsd-source-8.0.orig/sys/sys/resourcevar.h 2009-11-12 15:49:03.000000000 +0000
++++ kfreebsd-source-8.0/sys/sys/resourcevar.h 2009-11-12 16:22:12.000000000 +0000
@@ -35,6 +35,8 @@
#include <sys/resource.h>
@@ -380,10 +387,10 @@
#ifdef _KERNEL
#include <sys/_lock.h>
#include <sys/_mutex.h>
-Index: src/sys/sys/rtprio.h
+Index: kfreebsd-source-8.0/sys/sys/rtprio.h
===================================================================
---- src/sys/sys/rtprio.h.orig
-+++ src/sys/sys/rtprio.h
+--- kfreebsd-source-8.0.orig/sys/sys/rtprio.h 2009-11-12 15:49:03.000000000 +0000
++++ kfreebsd-source-8.0/sys/sys/rtprio.h 2009-11-12 16:22:12.000000000 +0000
@@ -36,6 +36,10 @@
#include <sys/priority.h>
@@ -422,10 +429,10 @@
__END_DECLS
#endif /* !_KERNEL */
#endif /* !_SYS_RTPRIO_H_ */
-Index: src/sys/sys/signalvar.h
+Index: kfreebsd-source-8.0/sys/sys/signalvar.h
===================================================================
---- src/sys/sys/signalvar.h.orig
-+++ src/sys/sys/signalvar.h
+--- kfreebsd-source-8.0.orig/sys/sys/signalvar.h 2009-11-12 15:49:03.000000000 +0000
++++ kfreebsd-source-8.0/sys/sys/signalvar.h 2009-11-12 16:22:12.000000000 +0000
@@ -43,6 +43,9 @@
* not exported to user programs.
*/
@@ -469,7 +476,7 @@
return (0);
}
return (1);
-@@ -215,6 +214,8 @@
+@@ -208,6 +215,8 @@
union sigval sigev_value; /* Signal value */
};
@@ -478,10 +485,10 @@
typedef struct ksiginfo {
TAILQ_ENTRY(ksiginfo) ksi_link;
siginfo_t ksi_info;
-Index: src/sys/sys/sysctl.h
+Index: kfreebsd-source-8.0/sys/sys/sysctl.h
===================================================================
---- src/sys/sys/sysctl.h.orig
-+++ src/sys/sys/sysctl.h
+--- kfreebsd-source-8.0.orig/sys/sys/sysctl.h 2009-11-12 15:49:03.000000000 +0000
++++ kfreebsd-source-8.0/sys/sys/sysctl.h 2009-11-12 16:22:12.000000000 +0000
@@ -36,7 +36,103 @@
#ifndef _SYS_SYSCTL_H_
#define _SYS_SYSCTL_H_
@@ -587,7 +594,7 @@
struct thread;
/*
-@@ -366,7 +462,7 @@
+@@ -387,7 +483,7 @@
#define KERN_SECURELVL 9 /* int: system security level */
#define KERN_HOSTNAME 10 /* string: hostname */
#define KERN_HOSTID 11 /* int: host identifier */
@@ -596,7 +603,7 @@
#define KERN_VNODE 13 /* struct: vnode structures */
#define KERN_PROC 14 /* struct: process entries */
#define KERN_FILE 15 /* struct: file entries */
-@@ -676,13 +772,21 @@
+@@ -711,13 +807,21 @@
int sysctl_wire_old_buffer(struct sysctl_req *req, size_t len);
#else /* !_KERNEL */
@@ -622,24 +629,10 @@
#endif /* _KERNEL */
#endif /* !_SYS_SYSCTL_H_ */
-Index: src/sys/sys/syslimits.h
+Index: kfreebsd-source-8.0/sys/sys/timepps.h
===================================================================
---- src/sys/sys/syslimits.h.orig
-+++ src/sys/sys/syslimits.h
-@@ -54,7 +54,9 @@
- #define MAX_CANON 255 /* max bytes in term canon input line */
- #define MAX_INPUT 255 /* max bytes in terminal input */
- #define NAME_MAX 255 /* max bytes in a file name */
-+#ifndef NGROUPS_MAX
- #define NGROUPS_MAX 16 /* max supplemental group id's */
-+#endif
- #ifndef OPEN_MAX
- #define OPEN_MAX 64 /* max open files per process */
- #endif
-Index: src/sys/sys/timepps.h
-===================================================================
---- src/sys/sys/timepps.h.orig
-+++ src/sys/sys/timepps.h
+--- kfreebsd-source-8.0.orig/sys/sys/timepps.h 2009-11-12 15:49:03.000000000 +0000
++++ kfreebsd-source-8.0/sys/sys/timepps.h 2009-11-12 16:22:12.000000000 +0000
@@ -15,6 +15,8 @@
#ifndef _SYS_TIMEPPS_H_
#define _SYS_TIMEPPS_H_
@@ -649,10 +642,10 @@
#include <sys/ioccom.h>
#include <sys/time.h>
-Index: src/sys/sys/timex.h
+Index: kfreebsd-source-8.0/sys/sys/timex.h
===================================================================
---- src/sys/sys/timex.h.orig
-+++ src/sys/sys/timex.h
+--- kfreebsd-source-8.0.orig/sys/sys/timex.h 2009-11-12 15:49:03.000000000 +0000
++++ kfreebsd-source-8.0/sys/sys/timex.h 2009-11-12 16:22:12.000000000 +0000
@@ -95,11 +95,9 @@
*/
#ifndef _SYS_TIMEX_H_
@@ -697,10 +690,10 @@
__END_DECLS
#endif /* _KERNEL */
-Index: src/sys/sys/ucred.h
+Index: kfreebsd-source-8.0/sys/sys/ucred.h
===================================================================
---- src/sys/sys/ucred.h.orig
-+++ src/sys/sys/ucred.h
+--- kfreebsd-source-8.0.orig/sys/sys/ucred.h 2009-11-12 15:49:03.000000000 +0000
++++ kfreebsd-source-8.0/sys/sys/ucred.h 2009-11-12 16:22:12.000000000 +0000
@@ -33,6 +33,9 @@
#ifndef _SYS_UCRED_H_
#define _SYS_UCRED_H_
@@ -711,35 +704,23 @@
#include <bsm/audit.h>
/*
-Index: src/sys/sys/xrpuio.h
+Index: kfreebsd-source-8.0/sys/vm/vm.h
===================================================================
---- src/sys/sys/xrpuio.h.orig
-+++ src/sys/sys/xrpuio.h
-@@ -13,6 +13,7 @@
- #ifndef _SYS_XRPUIO_H_
- #define _SYS_XRPUIO_H_
+--- kfreebsd-source-8.0.orig/sys/vm/vm.h 2009-11-12 15:49:04.000000000 +0000
++++ kfreebsd-source-8.0/sys/vm/vm.h 2009-11-12 16:22:12.000000000 +0000
+@@ -69,6 +69,8 @@
+ */
+ typedef char vm_memattr_t; /* memory attribute codes */
-+#include <sys/types.h>
- #include <sys/ioccom.h>
-
- #define XRPU_MAX_PPS 16
-Index: src/sys/vm/vm.h
-===================================================================
---- src/sys/vm/vm.h.orig
-+++ src/sys/vm/vm.h
-@@ -61,6 +61,8 @@
- #ifndef VM_H
- #define VM_H
-
+#include <sys/_types.h>
+
typedef char vm_inherit_t; /* inheritance codes */
#define VM_INHERIT_SHARE ((vm_inherit_t) 0)
-Index: src/sys/vm/vm_map.h
+Index: kfreebsd-source-8.0/sys/vm/vm_map.h
===================================================================
---- src/sys/vm/vm_map.h.orig
-+++ src/sys/vm/vm_map.h
+--- kfreebsd-source-8.0.orig/sys/vm/vm_map.h 2009-11-12 15:49:04.000000000 +0000
++++ kfreebsd-source-8.0/sys/vm/vm_map.h 2009-11-12 16:22:12.000000000 +0000
@@ -70,6 +70,12 @@
#include <sys/sx.h>
#include <sys/_mutex.h>
Modified: trunk/kfreebsd-kernel-headers/debian/patches/003_osreldate.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/003_osreldate.diff 2009-11-13 11:29:15 UTC (rev 2825)
+++ trunk/kfreebsd-kernel-headers/debian/patches/003_osreldate.diff 2009-11-13 13:38:14 UTC (rev 2826)
@@ -1,9 +1,9 @@
diff -Nur sys/osreldate.h sys/osreldate.h
---- src/sys/osreldate.h 1970-01-01 01:00:00.000000000 +0100
-+++ src/sys/osreldate.h 2004-08-03 02:21:30.000000000 +0200
+--- src/sys/osreldate.h
++++ src/sys/osreldate.h
@@ -0,0 +1,12 @@
+
-+/* kFreeBSD 7.1 headers */
++/* kFreeBSD 8.0 headers */
+
+#include <sys/cdefs.h>
+#ifndef _SYS_CDEFS_H_
@@ -11,6 +11,6 @@
+#endif
+
+#undef __FreeBSD_kernel__
-+#define __FreeBSD_kernel__ 7
-+#define __FreeBSD_kernel_version 701000
++#define __FreeBSD_kernel__ 8
++#define __FreeBSD_kernel_version 800107
+
Modified: trunk/kfreebsd-kernel-headers/debian/patches/006_sys_tty_h.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/006_sys_tty_h.diff 2009-11-13 11:29:15 UTC (rev 2825)
+++ trunk/kfreebsd-kernel-headers/debian/patches/006_sys_tty_h.diff 2009-11-13 13:38:14 UTC (rev 2826)
@@ -1,12 +1,13 @@
-diff -ur sys.orig/sys/tty.h sys/sys/tty.h
---- src/sys.orig/sys/tty.h 2004-07-15 22:47:41.000000000 +0200
-+++ src/sys/sys/tty.h 2004-11-30 01:13:49.000000000 +0100
-@@ -48,6 +48,8 @@
+Index: kfreebsd-source-8.0/sys/sys/tty.h
+===================================================================
+--- kfreebsd-source-8.0.orig/sys/sys/tty.h 2009-11-12 15:49:03.000000000 +0000
++++ kfreebsd-source-8.0/sys/sys/tty.h 2009-11-12 16:28:07.000000000 +0000
+@@ -34,6 +34,8 @@
- #include <sys/termios.h>
+ #include <sys/param.h>
#include <sys/queue.h>
+#include <sys/types.h>
+#include <sys/ioctl.h> /* winsize struct */
- #include <sys/selinfo.h>
- #include <sys/_lock.h>
- #include <sys/_mutex.h>
+ #include <sys/lock.h>
+ #include <sys/mutex.h>
+ #include <sys/condvar.h>
Modified: trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff 2009-11-13 11:29:15 UTC (rev 2825)
+++ trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff 2009-11-13 13:38:14 UTC (rev 2826)
@@ -1,6 +1,7 @@
-diff -ur sys.orig/net/if_dl.h sys/net/if_dl.h
---- src/sys.orig/net/route.h
-+++ src/sys/net/route.h
+Index: kfreebsd-source-8.0/sys/net/route.h
+===================================================================
+--- kfreebsd-source-8.0.orig/sys/net/route.h 2009-11-12 15:48:55.000000000 +0000
++++ kfreebsd-source-8.0/sys/net/route.h 2009-11-12 16:28:19.000000000 +0000
@@ -33,6 +33,8 @@
#ifndef _NET_ROUTE_H_
#define _NET_ROUTE_H_
@@ -10,9 +11,10 @@
/*
* Kernel resident routing tables.
*
-diff -ur sys.orig/net/if_dl.h sys/net/if_dl.h
---- src/sys.orig/net/if_dl.h 2004-11-30 01:05:19.000000000 +0100
-+++ src/sys/net/if_dl.h 2004-11-30 01:16:42.000000000 +0100
+Index: kfreebsd-source-8.0/sys/net/if_dl.h
+===================================================================
+--- kfreebsd-source-8.0.orig/sys/net/if_dl.h 2009-11-12 16:22:12.000000000 +0000
++++ kfreebsd-source-8.0/sys/net/if_dl.h 2009-11-12 16:28:19.000000000 +0000
@@ -59,13 +59,13 @@
* Structure of a Link-Level sockaddr:
*/
@@ -34,9 +36,10 @@
char sdl_data[46]; /* minimum work area, can be larger;
contains both if name and ll address */
};
-diff -ur sys.orig/net/if_var.h sys/net/if_var.h
---- src/sys.orig/net/if_var.h 2004-10-31 00:01:43.000000000 +0200
-+++ src/sys/net/if_var.h 2004-11-30 01:16:42.000000000 +0100
+Index: kfreebsd-source-8.0/sys/net/if_var.h
+===================================================================
+--- kfreebsd-source-8.0.orig/sys/net/if_var.h 2009-11-12 15:48:55.000000000 +0000
++++ kfreebsd-source-8.0/sys/net/if_var.h 2009-11-12 16:28:19.000000000 +0000
@@ -33,6 +33,9 @@
#ifndef _NET_IF_VAR_H_
#define _NET_IF_VAR_H_
@@ -47,7 +50,7 @@
/*
* Structures defining a network interface, providing a packet
* transport mechanism (ala level 0 of the PUP protocols).
-@@ -560,8 +560,19 @@
+@@ -696,8 +699,19 @@
*/
struct ifaddr {
struct sockaddr *ifa_addr; /* address of interface */
@@ -69,22 +72,24 @@
struct sockaddr *ifa_netmask; /* used to determine subnet */
struct if_data if_data; /* not all members are meaningful */
struct ifnet *ifa_ifp; /* back-pointer to interface */
-diff -ur sys.orig/netinet/in_var.h sys/netinet/in_var.h
---- src/sys.orig/netinet/in_var.h 2004-08-16 20:32:07.000000000 +0200
-+++ src/sys/netinet/in_var.h 2004-11-30 01:16:42.000000000 +0100
+Index: kfreebsd-source-8.0/sys/netinet/in_var.h
+===================================================================
+--- kfreebsd-source-8.0.orig/sys/netinet/in_var.h 2009-11-12 15:48:57.000000000 +0000
++++ kfreebsd-source-8.0/sys/netinet/in_var.h 2009-11-12 16:29:03.000000000 +0000
@@ -34,7 +34,9 @@
#define _NETINET_IN_VAR_H_
#include <sys/queue.h>
-+#include <net/if_var.h> /* ifaddr */
++#include <net/if_var.h> /* ifaddr */
#include <sys/fnv_hash.h>
-+#include <netinet/in.h> /* in_addr */
++#include <netinet/in.h> /* in_addr */
+ #include <sys/tree.h>
- /*
- * Interface address, Internet version. One of these structures
-diff -ur sys.orig/netinet/ip_var.h sys/netinet/ip_var.h
---- src/sys.orig/netinet/ip_var.h 2004-09-23 18:38:53.000000000 +0200
-+++ src/sys/netinet/ip_var.h 2004-11-30 01:16:42.000000000 +0100
+ struct igmp_ifinfo;
+Index: kfreebsd-source-8.0/sys/netinet/ip_var.h
+===================================================================
+--- kfreebsd-source-8.0.orig/sys/netinet/ip_var.h 2009-11-12 15:48:57.000000000 +0000
++++ kfreebsd-source-8.0/sys/netinet/ip_var.h 2009-11-12 16:28:19.000000000 +0000
@@ -34,6 +34,8 @@
#define _NETINET_IP_VAR_H_
@@ -94,12 +99,13 @@
/*
* Overlay for ip header used by other protocols (tcp, udp).
-diff -ur sys.orig/netinet6/in6_var.h sys/netinet6/in6_var.h
---- src/sys.orig/netinet6/in6_var.h 2004-11-30 01:05:19.000000000 +0100
-+++ src/sys/netinet6/in6_var.h 2004-11-30 01:16:42.000000000 +0100
-@@ -64,6 +64,9 @@
- #ifndef _NETINET6_IN6_VAR_H_
- #define _NETINET6_IN6_VAR_H_
+Index: kfreebsd-source-8.0/sys/netinet6/in6_var.h
+===================================================================
+--- kfreebsd-source-8.0.orig/sys/netinet6/in6_var.h 2009-11-12 15:48:58.000000000 +0000
++++ kfreebsd-source-8.0/sys/netinet6/in6_var.h 2009-11-12 16:28:19.000000000 +0000
+@@ -70,6 +70,9 @@
+ #include <sys/libkern.h>
+ #endif
+#include <sys/types.h> /* time_t */
+#include <netinet/in_var.h> /* ifaddr */
@@ -107,11 +113,12 @@
/*
* Interface address, Internet version. One of these structures
* is allocated for each interface with an Internet address.
-diff -ur sys.orig/sys/fnv_hash.h sys/sys/fnv_hash.h
---- src/sys.orig/sys/fnv_hash.h 2001-03-20 03:10:18.000000000 +0100
-+++ src/sys/sys/fnv_hash.h 2004-11-30 01:16:42.000000000 +0100
+Index: kfreebsd-source-8.0/sys/sys/fnv_hash.h
+===================================================================
+--- kfreebsd-source-8.0.orig/sys/sys/fnv_hash.h 2009-11-12 15:49:02.000000000 +0000
++++ kfreebsd-source-8.0/sys/sys/fnv_hash.h 2009-11-12 16:28:19.000000000 +0000
@@ -8,6 +8,8 @@
- * $FreeBSD: sys/sys/fnv_hash.h,v 1.2 2001/03/20 02:10:18 peter Exp $
+ * $FreeBSD: src/sys/sys/fnv_hash.h,v 1.3.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $
*/
+#include <sys/types.h>
Modified: trunk/kfreebsd-kernel-headers/debian/patches/011_wine.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/011_wine.diff 2009-11-13 11:29:15 UTC (rev 2825)
+++ trunk/kfreebsd-kernel-headers/debian/patches/011_wine.diff 2009-11-13 13:38:14 UTC (rev 2826)
@@ -1,8 +1,8 @@
-Index: src/sys/i386/include/segments.h
+Index: kfreebsd-source-8.0/sys/i386/include/segments.h
===================================================================
---- src/sys/i386/include/segments.h.orig
-+++ src/sys/i386/include/segments.h
-@@ -60,7 +60,7 @@
+--- kfreebsd-source-8.0.orig/sys/i386/include/segments.h 2009-11-12 15:48:49.000000000 +0000
++++ kfreebsd-source-8.0/sys/i386/include/segments.h 2009-11-12 16:29:14.000000000 +0000
+@@ -64,7 +64,7 @@
*/
struct segment_descriptor {
unsigned sd_lolimit:16 ; /* segment extent (lsb) */
@@ -11,7 +11,7 @@
unsigned sd_type:5 ; /* segment type */
unsigned sd_dpl:2 ; /* segment descriptor priority level */
unsigned sd_p:1 ; /* segment descriptor present */
-@@ -152,7 +152,7 @@
+@@ -156,7 +156,7 @@
*/
struct region_descriptor {
unsigned rd_limit:16; /* segment extent */
@@ -20,10 +20,10 @@
};
/*
-Index: src/sys/sys/elf32.h
+Index: kfreebsd-source-8.0/sys/sys/elf32.h
===================================================================
---- src/sys/sys/elf32.h.orig
-+++ src/sys/sys/elf32.h
+--- kfreebsd-source-8.0.orig/sys/sys/elf32.h 2009-11-12 15:49:02.000000000 +0000
++++ kfreebsd-source-8.0/sys/sys/elf32.h 2009-11-12 16:29:14.000000000 +0000
@@ -35,11 +35,9 @@
* ELF definitions common to all 32-bit architectures.
*/
@@ -238,10 +238,10 @@
-} Elf32_Syminfo;
-
#endif /* !_SYS_ELF32_H_ */
-Index: src/sys/sys/elf64.h
+Index: kfreebsd-source-8.0/sys/sys/elf64.h
===================================================================
---- src/sys/sys/elf64.h.orig
-+++ src/sys/sys/elf64.h
+--- kfreebsd-source-8.0.orig/sys/sys/elf64.h 2009-11-12 15:49:02.000000000 +0000
++++ kfreebsd-source-8.0/sys/sys/elf64.h 2009-11-12 16:30:35.000000000 +0000
@@ -35,14 +35,10 @@
* ELF definitions common to all 64-bit architectures.
*/
@@ -348,16 +348,16 @@
-} Elf64_Rela;
-
-/* Macros for accessing the fields of r_info. */
--#define ELF64_R_SYM(info) ((info) >> 32)
--#define ELF64_R_TYPE(info) ((info) & 0xffffffffL)
+-#define ELF64_R_SYM(info) ((info) >> 32)
+-#define ELF64_R_TYPE(info) ((info) & 0xffffffffL)
-
-/* Macro for constructing r_info from field values. */
--#define ELF64_R_INFO(sym, type) (((sym) << 32) + ((type) & 0xffffffffL))
+-#define ELF64_R_INFO(sym, type) (((sym) << 32) + ((type) & 0xffffffffL))
-
-#define ELF64_R_TYPE_DATA(info) (((Elf64_Xword)(info)<<32)>>40)
-#define ELF64_R_TYPE_ID(info) (((Elf64_Xword)(info)<<56)>>56)
-#define ELF64_R_TYPE_INFO(data, type) \
-- (((Elf64_Xword)(data)<<8)+(Elf64_Xword)(type))
+- (((Elf64_Xword)(data)<<8)+(Elf64_Xword)(type))
-
-/*
- * Note entry header
@@ -404,14 +404,14 @@
-} Elf64_Sym;
-
-/* Macros for accessing the fields of st_info. */
--#define ELF64_ST_BIND(info) ((info) >> 4)
--#define ELF64_ST_TYPE(info) ((info) & 0xf)
+-#define ELF64_ST_BIND(info) ((info) >> 4)
+-#define ELF64_ST_TYPE(info) ((info) & 0xf)
-
-/* Macro for constructing st_info from field values. */
--#define ELF64_ST_INFO(bind, type) (((bind) << 4) + ((type) & 0xf))
+-#define ELF64_ST_INFO(bind, type) (((bind) << 4) + ((type) & 0xf))
-
-/* Macro for accessing the fields of st_other. */
--#define ELF64_ST_VISIBILITY(oth) ((oth) & 0x3)
+-#define ELF64_ST_VISIBILITY(oth) ((oth) & 0x3)
-
-/* Structures used by Sun & GNU-style symbol versioning. */
-typedef struct {
@@ -453,13 +453,13 @@
-} Elf64_Syminfo;
-
#endif /* !_SYS_ELF64_H_ */
-Index: src/sys/sys/elf_common.h
+Index: kfreebsd-source-8.0/sys/sys/elf_common.h
===================================================================
---- src/sys/sys/elf_common.h.orig
-+++ src/sys/sys/elf_common.h
+--- kfreebsd-source-8.0.orig/sys/sys/elf_common.h 2009-11-12 15:49:02.000000000 +0000
++++ kfreebsd-source-8.0/sys/sys/elf_common.h 2009-11-12 16:29:14.000000000 +0000
@@ -29,6 +29,8 @@
#ifndef _SYS_ELF_COMMON_H_
- #define _SYS_ELF_COMMON_H_ 1
+ #define _SYS_ELF_COMMON_H_ 1
+#include <stdint.h>
+
@@ -478,4 +478,4 @@
+ uint32_t n_type; /* Type of this note. */
} Elf_Note;
- /* Indexes into the e_ident array. Keep synced with
+ /*
Modified: trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff 2009-11-13 11:29:15 UTC (rev 2825)
+++ trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff 2009-11-13 13:38:14 UTC (rev 2826)
@@ -1,18 +1,218 @@
-diff -ur sys.orig/dev/usb/usb.h sys/dev/usb/usb.h
---- src/sys.orig/dev/usb/usb.h 2005-03-02 21:21:45.000000000 +0100
-+++ src/sys/dev/usb/usb.h 2005-03-02 21:26:56.000000000 +0100
-@@ -98,7 +98,7 @@
- #define USETDW(w,v) (*(u_int32_t *)(w) = (v))
- #endif
+Index: kfreebsd-source-8.0/sys/dev/usb/usb.h
+===================================================================
+--- kfreebsd-source-8.0.orig/sys/dev/usb/usb.h 2009-11-12 15:48:44.000000000 +0000
++++ kfreebsd-source-8.0/sys/dev/usb/usb.h 2009-11-12 16:31:48.000000000 +0000
+@@ -146,7 +146,7 @@
+ uWord wValue;
+ uWord wIndex;
+ uWord wLength;
+-} __packed;
++} __attribute__ ((__packed__));
+ typedef struct usb_device_request usb_device_request_t;
--#define UPACKED __packed
-+#define UPACKED __attribute__ ((__packed__))
+ #define UT_WRITE 0x00
+@@ -268,7 +268,7 @@
+ uByte bLength;
+ uByte bDescriptorType;
+ uByte bDescriptorSubtype;
+-} __packed;
++} __attribute__ ((__packed__));
+ typedef struct usb_descriptor usb_descriptor_t;
- typedef struct {
- uByte bmRequestType;
-diff -ur sys.orig/i386/include/cpufunc.h sys/i386/include/cpufunc.h
---- src/sys.orig/i386/include/cpufunc.h 2004-04-07 22:46:05.000000000 +0200
-+++ src/sys/i386/include/cpufunc.h 2005-03-02 21:28:56.000000000 +0100
+ struct usb_device_descriptor {
+@@ -291,7 +291,7 @@
+ uByte iProduct;
+ uByte iSerialNumber;
+ uByte bNumConfigurations;
+-} __packed;
++} __attribute__ ((__packed__));
+ typedef struct usb_device_descriptor usb_device_descriptor_t;
+
+ /* Binary Device Object Store (BOS) */
+@@ -300,7 +300,7 @@
+ uByte bDescriptorType;
+ uWord wTotalLength;
+ uByte bNumDeviceCaps;
+-} __packed;
++} __attribute__ ((__packed__));
+ typedef struct usb_bos_descriptor usb_bos_descriptor_t;
+
+ /* Binary Device Object Store Capability */
+@@ -314,7 +314,7 @@
+ #define USB_DEVCAP_SUPER_SPEED 0x03
+ #define USB_DEVCAP_CONTAINER_ID 0x04
+ /* data ... */
+-} __packed;
++} __attribute__ ((__packed__));
+ typedef struct usb_bos_cap_descriptor usb_bos_cap_descriptor_t;
+
+ struct usb_devcap_usb2ext_descriptor {
+@@ -323,7 +323,7 @@
+ uByte bDevCapabilityType;
+ uByte bmAttributes;
+ #define USB_V2EXT_LPM 0x02
+-} __packed;
++} __attribute__ ((__packed__));
+ typedef struct usb_devcap_usb2ext_descriptor usb_devcap_usb2ext_descriptor_t;
+
+ struct usb_devcap_ss_descriptor {
+@@ -335,7 +335,7 @@
+ uByte bFunctionaltySupport;
+ uByte bU1DevExitLat;
+ uByte bU2DevExitLat;
+-} __packed;
++} __attribute__ ((__packed__));
+ typedef struct usb_devcap_ss_descriptor usb_devcap_ss_descriptor_t;
+
+ struct usb_devcap_container_id_descriptor {
+@@ -344,7 +344,7 @@
+ uByte bDevCapabilityType;
+ uByte bReserved;
+ uByte ContainerID;
+-} __packed;
++} __attribute__ ((__packed__));
+ typedef struct usb_devcap_container_id_descriptor
+ usb_devcap_container_id_descriptor_t;
+
+@@ -376,7 +376,7 @@
+ #define UC_REMOTE_WAKEUP 0x20
+ uByte bMaxPower; /* max current in 2 mA units */
+ #define UC_POWER_FACTOR 2
+-} __packed;
++} __attribute__ ((__packed__));
+ typedef struct usb_config_descriptor usb_config_descriptor_t;
+
+ struct usb_interface_descriptor {
+@@ -389,7 +389,7 @@
+ uByte bInterfaceSubClass;
+ uByte bInterfaceProtocol;
+ uByte iInterface;
+-} __packed;
++} __attribute__ ((__packed__));
+ typedef struct usb_interface_descriptor usb_interface_descriptor_t;
+
+ struct usb_interface_assoc_descriptor {
+@@ -401,7 +401,7 @@
+ uByte bFunctionSubClass;
+ uByte bFunctionProtocol;
+ uByte iFunction;
+-} __packed;
++} __attribute__ ((__packed__));
+ typedef struct usb_interface_assoc_descriptor usb_interface_assoc_descriptor_t;
+
+ /* Interface class codes */
+@@ -524,7 +524,7 @@
+ uWord wMaxPacketSize;
+ #define UE_ZERO_MPS 0xFFFF /* for internal use only */
+ uByte bInterval;
+-} __packed;
++} __attribute__ ((__packed__));
+ typedef struct usb_endpoint_descriptor usb_endpoint_descriptor_t;
+
+ struct usb_endpoint_ss_comp_descriptor {
+@@ -533,7 +533,7 @@
+ uWord bMaxBurst;
+ uByte bmAttributes;
+ uWord wBytesPerInterval;
+-} __packed;
++} __attribute__ ((__packed__));
+ typedef struct usb_endpoint_ss_comp_descriptor
+ usb_endpoint_ss_comp_descriptor_t;
+
+@@ -542,7 +542,7 @@
+ uByte bDescriptorType;
+ uWord bString[126];
+ uByte bUnused;
+-} __packed;
++} __attribute__ ((__packed__));
+ typedef struct usb_string_descriptor usb_string_descriptor_t;
+
+ #define USB_MAKE_STRING_DESC(m,name) \
+@@ -550,7 +550,7 @@
+ uByte bLength; \
+ uByte bDescriptorType; \
+ uByte bData[sizeof((uint8_t []){m})]; \
+-} __packed; \
++} __attribute__ ((__packed__)); \
+ static const struct name name = { \
+ .bLength = sizeof(struct name), \
+ .bDescriptorType = UDESC_STRING, \
+@@ -584,7 +584,7 @@
+ #define UHD_NOT_REMOV(desc, i) \
+ (((desc)->DeviceRemovable[(i)/8] >> ((i) % 8)) & 1)
+ uByte PortPowerCtrlMask[1]; /* deprecated */
+-} __packed;
++} __attribute__ ((__packed__));
+ typedef struct usb_hub_descriptor usb_hub_descriptor_t;
+
+ struct usb_hub_ss_descriptor {
+@@ -597,7 +597,7 @@
+ uByte bHubHdrDecLat;
+ uWord wHubDelay;
+ uByte DeviceRemovable[2]; /* max 15 ports */
+-} __packed;
++} __attribute__ ((__packed__));
+ typedef struct usb_hub_ss_descriptor usb_hub_ss_descriptor_t;
+
+ /* minimum HUB descriptor (8-ports maximum) */
+@@ -610,7 +610,7 @@
+ uByte bHubContrCurrent;
+ uByte DeviceRemovable[1];
+ uByte PortPowerCtrlMask[1];
+-} __packed;
++} __attribute__ ((__packed__));
+ typedef struct usb_hub_descriptor_min usb_hub_descriptor_min_t;
+
+ struct usb_device_qualifier {
+@@ -623,7 +623,7 @@
+ uByte bMaxPacketSize0;
+ uByte bNumConfigurations;
+ uByte bReserved;
+-} __packed;
++} __attribute__ ((__packed__));
+ typedef struct usb_device_qualifier usb_device_qualifier_t;
+
+ struct usb_otg_descriptor {
+@@ -632,7 +632,7 @@
+ uByte bmAttributes;
+ #define UOTG_SRP 0x01
+ #define UOTG_HNP 0x02
+-} __packed;
++} __attribute__ ((__packed__));
+ typedef struct usb_otg_descriptor usb_otg_descriptor_t;
+
+ /* OTG feature selectors */
+@@ -647,7 +647,7 @@
+ #define UDS_REMOTE_WAKEUP 0x0002
+ /* Endpoint status flags */
+ #define UES_HALT 0x0001
+-} __packed;
++} __attribute__ ((__packed__));
+ typedef struct usb_status usb_status_t;
+
+ struct usb_hub_status {
+@@ -655,7 +655,7 @@
+ #define UHS_LOCAL_POWER 0x0001
+ #define UHS_OVER_CURRENT 0x0002
+ uWord wHubChange;
+-} __packed;
++} __attribute__ ((__packed__));
+ typedef struct usb_hub_status usb_hub_status_t;
+
+ struct usb_port_status {
+@@ -677,7 +677,7 @@
+ #define UPS_C_SUSPEND 0x0004
+ #define UPS_C_OVERCURRENT_INDICATOR 0x0008
+ #define UPS_C_PORT_RESET 0x0010
+-} __packed;
++} __attribute__ ((__packed__));
+ typedef struct usb_port_status usb_port_status_t;
+
+ /*
+Index: kfreebsd-source-8.0/sys/i386/include/cpufunc.h
+===================================================================
+--- kfreebsd-source-8.0.orig/sys/i386/include/cpufunc.h 2009-11-12 15:48:49.000000000 +0000
++++ kfreebsd-source-8.0/sys/i386/include/cpufunc.h 2009-11-12 16:30:50.000000000 +0000
@@ -38,6 +38,8 @@
#ifndef _MACHINE_CPUFUNC_H_
#define _MACHINE_CPUFUNC_H_
@@ -22,113 +222,7 @@
#ifndef _SYS_CDEFS_H_
#error this file needs sys/cdefs.h as a prerequisite
#endif
-@@ -193,57 +193,12 @@
- return (data);
- }
-
--static __inline u_int
--inl(u_int port)
--{
-- u_int data;
--
-- __asm __volatile("inl %%dx,%0" : "=a" (data) : "d" (port));
-- return (data);
--}
--
--static __inline void
--insb(u_int port, void *addr, size_t cnt)
--{
-- __asm __volatile("cld; rep; insb"
-- : "+D" (addr), "+c" (cnt)
-- : "d" (port)
-- : "memory");
--}
--
--static __inline void
--insw(u_int port, void *addr, size_t cnt)
--{
-- __asm __volatile("cld; rep; insw"
-- : "+D" (addr), "+c" (cnt)
-- : "d" (port)
-- : "memory");
--}
--
--static __inline void
--insl(u_int port, void *addr, size_t cnt)
--{
-- __asm __volatile("cld; rep; insl"
-- : "+D" (addr), "+c" (cnt)
-- : "d" (port)
-- : "memory");
--}
--
- static __inline void
- invd(void)
- {
- __asm __volatile("invd");
- }
-
--static __inline u_short
--inw(u_int port)
--{
-- u_short data;
--
-- __asm __volatile("inw %%dx,%0" : "=a" (data) : "d" (port));
-- return (data);
--}
--
- static __inline void
- outbv(u_int port, u_char data)
- {
-@@ -259,47 +214,6 @@
- }
-
- static __inline void
--outl(u_int port, u_int data)
--{
-- /*
-- * outl() and outw() aren't used much so we haven't looked at
-- * possible micro-optimizations such as the unnecessary
-- * assignment for them.
-- */
-- __asm __volatile("outl %0,%%dx" : : "a" (data), "d" (port));
--}
--
--static __inline void
--outsb(u_int port, const void *addr, size_t cnt)
--{
-- __asm __volatile("cld; rep; outsb"
-- : "+S" (addr), "+c" (cnt)
-- : "d" (port));
--}
--
--static __inline void
--outsw(u_int port, const void *addr, size_t cnt)
--{
-- __asm __volatile("cld; rep; outsw"
-- : "+S" (addr), "+c" (cnt)
-- : "d" (port));
--}
--
--static __inline void
--outsl(u_int port, const void *addr, size_t cnt)
--{
-- __asm __volatile("cld; rep; outsl"
-- : "+S" (addr), "+c" (cnt)
-- : "d" (port));
--}
--
--static __inline void
--outw(u_int port, u_short data)
--{
-- __asm __volatile("outw %0,%%dx" : : "a" (data), "d" (port));
--}
--
--static __inline void
- ia32_pause(void)
- {
- __asm __volatile("pause");
-@@ -629,16 +543,11 @@
+@@ -683,16 +685,11 @@
void halt(void);
void ia32_pause(void);
u_char inb(u_int port);
@@ -145,7 +239,7 @@
void lidt(struct region_descriptor *addr);
void lldt(u_short sel);
void load_cr0(u_int cr0);
-@@ -656,11 +565,6 @@
+@@ -710,11 +707,6 @@
void load_gs(u_int sel);
void ltr(u_short sel);
void outb(u_int port, u_char data);
@@ -157,9 +251,10 @@
u_int rcr0(void);
u_int rcr2(void);
u_int rcr3(void);
-diff -ur sys.orig/sys/_types.h sys/sys/_types.h
---- src/sys.orig/sys/_types.h 2004-06-19 19:58:32.000000000 +0200
-+++ src/sys/sys/_types.h 2005-03-02 21:27:37.000000000 +0100
+Index: kfreebsd-source-8.0/sys/sys/_types.h
+===================================================================
+--- kfreebsd-source-8.0.orig/sys/sys/_types.h 2009-11-12 15:49:02.000000000 +0000
++++ kfreebsd-source-8.0/sys/sys/_types.h 2009-11-12 16:30:50.000000000 +0000
@@ -31,6 +31,7 @@
#include <sys/cdefs.h>
@@ -183,7 +278,7 @@
typedef __uint32_t __ino_t; /* inode number */
typedef long __key_t; /* IPC key (for Sys V IPC) */
typedef __int32_t __lwpid_t; /* Thread ID (a.k.a. LWP) */
-@@ -84,13 +82,4 @@
+@@ -93,13 +98,4 @@
typedef __uint32_t __fixpt_t; /* fixed point number */
Modified: trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff 2009-11-13 11:29:15 UTC (rev 2825)
+++ trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff 2009-11-13 13:38:14 UTC (rev 2826)
@@ -1,7 +1,7 @@
-Index: src/sys/cam/scsi/scsi_all.h
+Index: kfreebsd-source-8.0/sys/cam/scsi/scsi_all.h
===================================================================
---- src/sys/cam/scsi/scsi_all.h.orig
-+++ src/sys/cam/scsi/scsi_all.h
+--- kfreebsd-source-8.0.orig/sys/cam/scsi/scsi_all.h 2009-11-12 15:48:27.000000000 +0000
++++ kfreebsd-source-8.0/sys/cam/scsi/scsi_all.h 2009-11-12 16:33:38.000000000 +0000
@@ -25,6 +25,7 @@
#define _SCSI_SCSI_ALL_H 1
@@ -10,10 +10,10 @@
#ifdef _KERNEL
/*
-Index: src/sys/i386/include/md_var.h
+Index: kfreebsd-source-8.0/sys/i386/include/md_var.h
===================================================================
---- src/sys/i386/include/md_var.h.orig
-+++ src/sys/i386/include/md_var.h
+--- kfreebsd-source-8.0.orig/sys/i386/include/md_var.h 2009-11-12 15:48:49.000000000 +0000
++++ kfreebsd-source-8.0/sys/i386/include/md_var.h 2009-11-12 16:33:38.000000000 +0000
@@ -32,6 +32,8 @@
#ifndef _MACHINE_MD_VAR_H_
#define _MACHINE_MD_VAR_H_
@@ -23,10 +23,10 @@
/*
* Miscellaneous machine-dependent declarations.
*/
-Index: src/sys/amd64/include/md_var.h
+Index: kfreebsd-source-8.0/sys/amd64/include/md_var.h
===================================================================
---- src/sys/amd64/include/md_var.h.orig
-+++ src/sys/amd64/include/md_var.h
+--- kfreebsd-source-8.0.orig/sys/amd64/include/md_var.h 2009-11-12 15:48:23.000000000 +0000
++++ kfreebsd-source-8.0/sys/amd64/include/md_var.h 2009-11-12 16:33:38.000000000 +0000
@@ -32,6 +32,8 @@
#ifndef _MACHINE_MD_VAR_H_
#define _MACHINE_MD_VAR_H_
@@ -36,10 +36,10 @@
/*
* Miscellaneous machine-dependent declarations.
*/
-Index: src/sys/sys/_mutex.h
+Index: kfreebsd-source-8.0/sys/sys/_mutex.h
===================================================================
---- src/sys/sys/_mutex.h.orig
-+++ src/sys/sys/_mutex.h
+--- kfreebsd-source-8.0.orig/sys/sys/_mutex.h 2009-11-12 15:49:02.000000000 +0000
++++ kfreebsd-source-8.0/sys/sys/_mutex.h 2009-11-12 16:33:38.000000000 +0000
@@ -31,6 +31,8 @@
#ifndef _SYS__MUTEX_H_
#define _SYS__MUTEX_H_
@@ -49,10 +49,10 @@
/*
* Sleep/spin mutex.
*/
-Index: src/sys/sys/_timeval.h
+Index: kfreebsd-source-8.0/sys/sys/_timeval.h
===================================================================
---- src/sys/sys/_timeval.h.orig
-+++ src/sys/sys/_timeval.h
+--- kfreebsd-source-8.0.orig/sys/sys/_timeval.h 2009-11-12 15:49:02.000000000 +0000
++++ kfreebsd-source-8.0/sys/sys/_timeval.h 2009-11-12 16:33:38.000000000 +0000
@@ -30,6 +30,7 @@
#define _SYS__TIMEVAL_H_
@@ -74,10 +74,10 @@
-};
-
#endif /* !_SYS__TIMEVAL_H_ */
-Index: src/sys/sys/bio.h
+Index: kfreebsd-source-8.0/sys/sys/bio.h
===================================================================
---- src/sys/sys/bio.h.orig
-+++ src/sys/sys/bio.h
+--- kfreebsd-source-8.0.orig/sys/sys/bio.h 2009-11-12 15:49:02.000000000 +0000
++++ kfreebsd-source-8.0/sys/sys/bio.h 2009-11-12 16:33:38.000000000 +0000
@@ -39,6 +39,15 @@
#define _SYS_BIO_H_
@@ -94,10 +94,10 @@
struct disk;
struct bio;
-Index: src/sys/sys/devicestat.h
+Index: kfreebsd-source-8.0/sys/sys/devicestat.h
===================================================================
---- src/sys/sys/devicestat.h.orig
-+++ src/sys/sys/devicestat.h
+--- kfreebsd-source-8.0.orig/sys/sys/devicestat.h 2009-11-12 15:49:02.000000000 +0000
++++ kfreebsd-source-8.0/sys/sys/devicestat.h 2009-11-12 16:33:38.000000000 +0000
@@ -33,6 +33,9 @@
#include <sys/queue.h>
@@ -108,25 +108,27 @@
/*
* XXX: Should really be SPECNAMELEN
-Index: src/sys/sys/sbuf.h
+Index: kfreebsd-source-8.0/sys/sys/sbuf.h
===================================================================
---- src/sys/sys/sbuf.h.orig
-+++ src/sys/sys/sbuf.h
-@@ -62,8 +62,8 @@
+--- kfreebsd-source-8.0.orig/sys/sys/sbuf.h 2009-11-12 15:49:03.000000000 +0000
++++ kfreebsd-source-8.0/sys/sys/sbuf.h 2009-11-12 16:34:29.000000000 +0000
+@@ -64,10 +64,8 @@
int sbuf_bcpy(struct sbuf *, const void *, size_t);
int sbuf_cat(struct sbuf *, const char *);
int sbuf_cpy(struct sbuf *, const char *);
--int sbuf_printf(struct sbuf *, const char *, ...) __printflike(2, 3);
--int sbuf_vprintf(struct sbuf *, const char *, __va_list) __printflike(2, 0);
+-int sbuf_printf(struct sbuf *, const char *, ...)
+- __printflike(2, 3);
+-int sbuf_vprintf(struct sbuf *, const char *, __va_list)
+- __printflike(2, 0);
+int sbuf_printf(struct sbuf *, const char *, ...);
+int sbuf_vprintf(struct sbuf *, const char *, va_list);
int sbuf_putc(struct sbuf *, int);
int sbuf_trim(struct sbuf *);
int sbuf_overflowed(struct sbuf *);
-Index: src/sys/sys/timespec.h
+Index: kfreebsd-source-8.0/sys/sys/timespec.h
===================================================================
---- src/sys/sys/timespec.h.orig
-+++ src/sys/sys/timespec.h
+--- kfreebsd-source-8.0.orig/sys/sys/timespec.h 2009-11-12 15:49:03.000000000 +0000
++++ kfreebsd-source-8.0/sys/sys/timespec.h 2009-11-12 16:33:38.000000000 +0000
@@ -43,10 +43,7 @@
#define _TIME_T_DECLARED
#endif
Modified: trunk/kfreebsd-kernel-headers/debian/patches/020_concat_elf_generic.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/020_concat_elf_generic.diff 2009-11-13 11:29:15 UTC (rev 2825)
+++ trunk/kfreebsd-kernel-headers/debian/patches/020_concat_elf_generic.diff 2009-11-13 13:38:14 UTC (rev 2826)
@@ -1,16 +1,18 @@
---- src/sys/sys/elf_generic.h 2006-04-02 16:51:38.000000000 +0200
-+++ src/sys/sys/elf_generic.h 2006-04-02 16:51:38.000000000 +0200
+Index: kfreebsd-source-8.0/sys/sys/elf_generic.h
+===================================================================
+--- kfreebsd-source-8.0.orig/sys/sys/elf_generic.h 2009-11-12 15:49:02.000000000 +0000
++++ kfreebsd-source-8.0/sys/sys/elf_generic.h 2009-11-12 16:36:05.000000000 +0000
@@ -50,9 +50,10 @@
#error "Unknown byte order"
#endif
--#define __elfN(x) __CONCAT(__CONCAT(__CONCAT(elf,__ELF_WORD_SIZE),_),x)
--#define __ElfN(x) __CONCAT(__CONCAT(__CONCAT(Elf,__ELF_WORD_SIZE),_),x)
--#define __ELFN(x) __CONCAT(__CONCAT(__CONCAT(ELF,__ELF_WORD_SIZE),_),x)
+-#define __elfN(x) __CONCAT(__CONCAT(__CONCAT(elf,__ELF_WORD_SIZE),_),x)
+-#define __ElfN(x) __CONCAT(__CONCAT(__CONCAT(Elf,__ELF_WORD_SIZE),_),x)
+-#define __ELFN(x) __CONCAT(__CONCAT(__CONCAT(ELF,__ELF_WORD_SIZE),_),x)
+#define ___CONCAT(a,b) __CONCAT(a,b)
-+#define __elfN(x) ___CONCAT(___CONCAT(___CONCAT(elf,__ELF_WORD_SIZE),_),x)
-+#define __ElfN(x) ___CONCAT(___CONCAT(___CONCAT(Elf,__ELF_WORD_SIZE),_),x)
-+#define __ELFN(x) ___CONCAT(___CONCAT(___CONCAT(ELF,__ELF_WORD_SIZE),_),x)
- #define __ElfType(x) typedef __ElfN(x) __CONCAT(Elf_,x)
++#define __elfN(x) ___CONCAT(___CONCAT(___CONCAT(elf,__ELF_WORD_SIZE),_),x)
++#define __ElfN(x) ___CONCAT(___CONCAT(___CONCAT(Elf,__ELF_WORD_SIZE),_),x)
++#define __ELFN(x) ___CONCAT(___CONCAT(___CONCAT(ELF,__ELF_WORD_SIZE),_),x)
+ #define __ElfType(x) typedef __ElfN(x) __CONCAT(Elf_,x)
__ElfType(Addr);
Modified: trunk/kfreebsd-kernel-headers/debian/patches/021_machine__types.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/021_machine__types.diff 2009-11-13 11:29:15 UTC (rev 2825)
+++ trunk/kfreebsd-kernel-headers/debian/patches/021_machine__types.diff 2009-11-13 13:38:14 UTC (rev 2826)
@@ -1,7 +1,7 @@
-Index: src/sys/i386/include/_types.h
+Index: kfreebsd-source-8.0/sys/i386/include/_types.h
===================================================================
---- src/sys/i386/include/_types.h.orig 2006-08-25 12:18:54.091511000 +0200
-+++ src/sys/i386/include/_types.h 2006-08-25 12:25:31.000000000 +0200
+--- kfreebsd-source-8.0.orig/sys/i386/include/_types.h 2009-11-12 15:48:49.000000000 +0000
++++ kfreebsd-source-8.0/sys/i386/include/_types.h 2009-11-12 16:39:23.000000000 +0000
@@ -39,12 +39,15 @@
#ifndef _MACHINE__TYPES_H_
#define _MACHINE__TYPES_H_
@@ -19,20 +19,20 @@
/*
* Basic types upon which most other types are built.
*/
-@@ -69,18 +72,20 @@
+@@ -69,18 +72,19 @@
/* LONGLONG */
typedef unsigned long long __uint64_t;
#endif
+-
+#endif /* __GLIBC__ */
-
/*
* Standard type definitions.
*/
-typedef unsigned long __clock_t; /* clock()... */
typedef unsigned int __cpumask_t;
typedef __int32_t __critical_t;
- typedef double __double_t;
- typedef double __float_t;
+ typedef long double __double_t;
+ typedef long double __float_t;
typedef __int32_t __intfptr_t;
typedef __int64_t __intmax_t;
+#ifndef __GLIBC__
@@ -41,7 +41,7 @@
typedef __int32_t __int_fast8_t;
typedef __int32_t __int_fast16_t;
typedef __int32_t __int_fast32_t;
-@@ -92,9 +97,11 @@
+@@ -92,9 +96,11 @@
typedef __int32_t __ptrdiff_t; /* ptr1 - ptr2 */
typedef __int32_t __register_t;
typedef __int32_t __segsz_t; /* segment size (in pages) */
@@ -53,10 +53,10 @@
typedef __uint32_t __uintfptr_t;
typedef __uint64_t __uintmax_t;
typedef __uint32_t __uintptr_t;
-Index: src/sys/amd64/include/_types.h
+Index: kfreebsd-source-8.0/sys/amd64/include/_types.h
===================================================================
---- src/sys/amd64/include/_types.h.orig 2006-08-25 12:18:54.127268000 +0200
-+++ src/sys/amd64/include/_types.h 2006-08-25 12:26:12.000000000 +0200
+--- kfreebsd-source-8.0.orig/sys/amd64/include/_types.h 2009-11-12 15:48:23.000000000 +0000
++++ kfreebsd-source-8.0/sys/amd64/include/_types.h 2009-11-12 16:40:19.000000000 +0000
@@ -39,12 +39,15 @@
#ifndef _MACHINE__TYPES_H_
#define _MACHINE__TYPES_H_
@@ -74,7 +74,7 @@
/*
* Basic types upon which most other types are built.
*/
-@@ -56,18 +59,20 @@
+@@ -56,16 +59,18 @@
typedef unsigned int __uint32_t;
typedef long __int64_t;
typedef unsigned long __uint64_t;
@@ -87,15 +87,13 @@
typedef unsigned int __cpumask_t;
typedef __int64_t __critical_t;
typedef double __double_t;
- typedef double __float_t;
+ typedef float __float_t;
++#ifndef __GLIBC__
typedef __int64_t __intfptr_t;
++#endif
typedef __int64_t __intmax_t;
-+#ifndef __GLIBC__
typedef __int64_t __intptr_t;
-+#endif
typedef __int32_t __int_fast8_t;
- typedef __int32_t __int_fast16_t;
- typedef __int32_t __int_fast32_t;
@@ -79,9 +84,11 @@
typedef __int64_t __ptrdiff_t; /* ptr1 - ptr2 */
typedef __int64_t __register_t;
Modified: trunk/kfreebsd-kernel-headers/debian/patches/023_packed.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/023_packed.diff 2009-11-13 11:29:15 UTC (rev 2825)
+++ trunk/kfreebsd-kernel-headers/debian/patches/023_packed.diff 2009-11-13 13:38:14 UTC (rev 2826)
@@ -1,8 +1,14 @@
-Index: src/sys/net80211/ieee80211.h
+Index: kfreebsd-source-8.0/sys/net80211/ieee80211.h
===================================================================
---- src/sys/net80211/ieee80211.h.orig
-+++ src/sys/net80211/ieee80211.h
-@@ -44,7 +44,7 @@
+--- kfreebsd-source-8.0.orig/sys/net80211/ieee80211.h 2009-11-12 16:27:26.000000000 +0000
++++ kfreebsd-source-8.0/sys/net80211/ieee80211.h 2009-11-12 16:42:04.000000000 +0000
+@@ -1,4 +1,4 @@
+-/*-
++ /*-
+ * Copyright (c) 2001 Atsushi Onoe
+ * Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
+ * All rights reserved.
+@@ -46,7 +46,7 @@
uint8_t i_service;
uint16_t i_length;
uint16_t i_crc;
@@ -11,7 +17,7 @@
#define IEEE80211_PLCP_SFD 0xF3A0
#define IEEE80211_PLCP_SERVICE 0x00
-@@ -61,7 +61,7 @@
+@@ -68,7 +68,7 @@
uint8_t i_seq[2];
/* possibly followed by addr4[IEEE80211_ADDR_LEN]; */
/* see below */
@@ -20,7 +26,7 @@
struct ieee80211_qosframe {
uint8_t i_fc[2];
-@@ -73,7 +73,7 @@
+@@ -80,7 +80,7 @@
uint8_t i_qos[2];
/* possibly followed by addr4[IEEE80211_ADDR_LEN]; */
/* see below */
@@ -29,7 +35,7 @@
struct ieee80211_qoscntl {
uint8_t i_qos[2];
-@@ -87,7 +87,7 @@
+@@ -94,7 +94,7 @@
uint8_t i_addr3[IEEE80211_ADDR_LEN];
uint8_t i_seq[2];
uint8_t i_addr4[IEEE80211_ADDR_LEN];
@@ -38,7 +44,7 @@
struct ieee80211_qosframe_addr4 {
-@@ -99,7 +99,7 @@
+@@ -106,7 +106,7 @@
uint8_t i_seq[2];
uint8_t i_addr4[IEEE80211_ADDR_LEN];
uint8_t i_qos[2];
@@ -47,7 +53,7 @@
#define IEEE80211_FC0_VERSION_MASK 0x03
#define IEEE80211_FC0_VERSION_SHIFT 0
-@@ -205,7 +205,7 @@
+@@ -217,7 +217,7 @@
uint8_t wme_subtype; /* OUI subtype */
uint8_t wme_version; /* spec revision */
uint8_t wme_info; /* QoS info */
@@ -56,7 +62,7 @@
/*
* WME/802.11e Tspec Element
-@@ -233,7 +233,7 @@
+@@ -245,7 +245,7 @@
uint8_t ts_delay[4];
uint8_t ts_surplus[2];
uint8_t ts_medium_time[2];
@@ -65,7 +71,7 @@
/*
* WME AC parameter field
-@@ -242,7 +242,7 @@
+@@ -254,7 +254,7 @@
uint8_t acp_aci_aifsn;
uint8_t acp_logcwminmax;
uint16_t acp_txop;
@@ -74,7 +80,7 @@
#define WME_NUM_AC 4 /* 4 AC categories */
#define WME_NUM_TID 16 /* 16 tids */
-@@ -284,7 +284,7 @@
+@@ -296,7 +296,7 @@
#define WME_QOSINFO_COUNT 0x0f /* Mask for param count field */
uint8_t param_reserved;
struct ieee80211_wme_acparams params_acParams[WME_NUM_AC];
@@ -83,7 +89,7 @@
/*
* Management Notification Frame
-@@ -294,7 +294,7 @@
+@@ -306,7 +306,7 @@
uint8_t mnf_action;
uint8_t mnf_dialog;
uint8_t mnf_status;
@@ -92,16 +98,16 @@
#define MNF_SETUP_REQ 0
#define MNF_SETUP_RESP 1
#define MNF_TEARDOWN 2
-@@ -306,7 +306,7 @@
+@@ -318,7 +318,7 @@
struct ieee80211_action {
uint8_t ia_category;
uint8_t ia_action;
-} __packed;
+} __attribute__((__packed__));
- #define IEEE80211_ACTION_CAT_QOS 0 /* QoS */
- #define IEEE80211_ACTION_CAT_BA 3 /* BA */
-@@ -319,7 +319,7 @@
+ #define IEEE80211_ACTION_CAT_SM 0 /* Spectrum Management */
+ #define IEEE80211_ACTION_CAT_QOS 1 /* QoS */
+@@ -334,7 +334,7 @@
struct ieee80211_action_ht_txchwidth {
struct ieee80211_action at_header;
uint8_t at_chwidth;
@@ -110,7 +116,7 @@
#define IEEE80211_A_HT_TXCHWIDTH_20 0
#define IEEE80211_A_HT_TXCHWIDTH_2040 1
-@@ -328,7 +328,7 @@
+@@ -343,7 +343,7 @@
struct ieee80211_action_ht_mimopowersave {
struct ieee80211_action am_header;
uint8_t am_control;
@@ -119,7 +125,7 @@
#define IEEE80211_A_HT_MIMOPWRSAVE_ENA 0x01 /* PS enabled */
#define IEEE80211_A_HT_MIMOPWRSAVE_MODE 0x02
-@@ -372,7 +372,7 @@
+@@ -387,7 +387,7 @@
uint16_t rq_baparamset;
uint16_t rq_batimeout; /* in TUs */
uint16_t rq_baseqctl;
@@ -128,7 +134,7 @@
/* BA - ADDBA response */
struct ieee80211_action_ba_addbaresponse {
-@@ -381,14 +381,14 @@
+@@ -396,14 +396,14 @@
uint16_t rs_statuscode;
uint16_t rs_baparamset;
uint16_t rs_batimeout; /* in TUs */
@@ -145,7 +151,7 @@
/* BAR Control */
#define IEEE80211_BAR_TID 0xf000 /* TID */
-@@ -400,7 +400,7 @@
+@@ -419,7 +419,7 @@
struct ieee80211_ba_request {
uint16_t rq_barctl;
uint16_t rq_barseqctl;
@@ -154,7 +160,7 @@
/*
* Control frames.
-@@ -411,7 +411,7 @@
+@@ -430,7 +430,7 @@
uint8_t i_addr1[IEEE80211_ADDR_LEN];
uint8_t i_addr2[IEEE80211_ADDR_LEN];
/* FCS */
@@ -163,7 +169,7 @@
struct ieee80211_frame_rts {
uint8_t i_fc[2];
-@@ -419,21 +419,21 @@
+@@ -438,21 +438,21 @@
uint8_t i_ra[IEEE80211_ADDR_LEN];
uint8_t i_ta[IEEE80211_ADDR_LEN];
/* FCS */
@@ -188,7 +194,7 @@
struct ieee80211_frame_pspoll {
uint8_t i_fc[2];
-@@ -441,7 +441,7 @@
+@@ -460,7 +460,7 @@
uint8_t i_bssid[IEEE80211_ADDR_LEN];
uint8_t i_ta[IEEE80211_ADDR_LEN];
/* FCS */
@@ -197,7 +203,7 @@
struct ieee80211_frame_cfend { /* NB: also CF-End+CF-Ack */
uint8_t i_fc[2];
-@@ -449,7 +449,7 @@
+@@ -468,7 +468,7 @@
uint8_t i_ra[IEEE80211_ADDR_LEN];
uint8_t i_bssid[IEEE80211_ADDR_LEN];
/* FCS */
@@ -206,7 +212,7 @@
struct ieee80211_frame_bar {
uint8_t i_fc[2];
-@@ -459,7 +459,7 @@
+@@ -478,7 +478,7 @@
uint16_t i_ctl;
uint16_t i_seq;
/* FCS */
@@ -215,7 +221,7 @@
/*
* BEACON management packets
-@@ -511,7 +511,7 @@
+@@ -535,7 +535,7 @@
uint16_t wpa_caps; /* 802.11i capabilities */
uint16_t wpa_pmkidcnt; /* 802.11i pmkid count */
uint16_t wpa_pmkids[8]; /* 802.11i pmkids */
@@ -224,7 +230,7 @@
/*
* 802.11n HT Capability IE
-@@ -526,7 +526,7 @@
+@@ -550,7 +550,7 @@
uint16_t hc_extcap; /* extended HT capabilities */
uint32_t hc_txbf; /* txbf capabilities */
uint8_t hc_antenna; /* antenna capabilities */
@@ -233,7 +239,7 @@
/* HT capability flags (ht_cap) */
#define IEEE80211_HTCAP_LDPC 0x0001 /* LDPC supported */
-@@ -601,7 +601,7 @@
+@@ -630,7 +630,7 @@
uint8_t hi_byte3; /* ht ie byte 3 */
uint16_t hi_byte45; /* ht ie bytes 4+5 */
uint8_t hi_basicmcsset[16]; /* basic MCS set */
@@ -242,7 +248,7 @@
/* byte1 */
#define IEEE80211_HTINFO_2NDCHAN 0x03 /* secondary/ext chan offset */
-@@ -687,7 +687,7 @@
+@@ -739,7 +739,7 @@
uint8_t tim_period; /* DTIM period */
uint8_t tim_bitctl; /* bitmap control */
uint8_t tim_bitmap[1]; /* variable-length bitmap */
@@ -251,18 +257,18 @@
struct ieee80211_country_ie {
uint8_t ie; /* IEEE80211_ELEMID_COUNTRY */
-@@ -697,8 +697,8 @@
+@@ -749,8 +749,8 @@
uint8_t schan; /* starting channel */
uint8_t nchan; /* number channels */
uint8_t maxtxpwr; /* tx power cap */
-- } __packed band[10]; /* sub bands */
+- } __packed band[1]; /* sub bands (NB: var size) */
-} __packed;
-+ } __attribute__((__packed__)) band[10]; /* sub bands */
++ } __attribute__((__packed__)) band[1]; /* sub bands (NB: var size) */
+} __attribute__((__packed__));
- /*
- * 802.11h Channel Switch Announcement (CSA).
-@@ -709,7 +709,7 @@
+ #define IEEE80211_COUNTRY_MAX_BANDS 84 /* max possible bands */
+ #define IEEE80211_COUNTRY_MAX_SIZE \
+@@ -765,7 +765,7 @@
uint8_t csa_mode; /* Channel Switch Mode */
uint8_t csa_newchan; /* New Channel Number */
uint8_t csa_count; /* Channel Switch Count */
@@ -270,21 +276,12 @@
+} __attribute__((__packed__));
/*
- * Atheros advanced capability information element.
-@@ -731,7 +731,7 @@
- #define ATHEROS_CAP_WME 0x40 /* CWMin tuning */
- #define ATHEROS_CAP_BOOST 0x80 /* use turbo/!turbo mode */
- uint8_t ath_defkeyix[2];
--} __packed;
-+} __attribute__((__packed__));
-
- /* rate set entries are in .5 Mb/s units, and potentially marked as basic */
- #define IEEE80211_RATE_BASIC 0x80
-Index: src/sys/sys/ata.h
+ * Note the min acceptable CSA count is used to guard against
+Index: kfreebsd-source-8.0/sys/sys/ata.h
===================================================================
---- src/sys/sys/ata.h.orig
-+++ src/sys/sys/ata.h
-@@ -167,7 +167,7 @@
+--- kfreebsd-source-8.0.orig/sys/sys/ata.h 2009-11-12 15:49:02.000000000 +0000
++++ kfreebsd-source-8.0/sys/sys/ata.h 2009-11-12 16:40:39.000000000 +0000
+@@ -170,7 +170,7 @@
#define ATA_SUPPORT_WRITEDMAFUAEXT 0x0040
#define ATA_SUPPORT_WRITEDMAQFUAEXT 0x0080
#define ATA_SUPPORT_64BITWWN 0x0100
@@ -293,7 +290,7 @@
/*088*/ u_int16_t udmamodes; /* UltraDMA modes */
/*089*/ u_int16_t erase_time;
-@@ -198,7 +198,7 @@
+@@ -201,7 +201,7 @@
/*176*/ u_int16_t media_serial[30];
u_int16_t reserved206[49];
/*255*/ u_int16_t integrity;
@@ -302,7 +299,7 @@
/* ATA transfer modes */
-@@ -400,7 +400,7 @@
+@@ -405,7 +405,7 @@
u_int8_t specific1; /* sense key specific */
u_int8_t specific2; /* sense key specific */
@@ -311,10 +308,10 @@
struct ata_ioc_request {
union {
-Index: src/sys/dev/ata/atapi-cd.h
+Index: kfreebsd-source-8.0/sys/dev/ata/atapi-cd.h
===================================================================
---- src/sys/dev/ata/atapi-cd.h.orig
-+++ src/sys/dev/ata/atapi-cd.h
+--- kfreebsd-source-8.0.orig/sys/dev/ata/atapi-cd.h 2009-11-12 15:48:35.000000000 +0000
++++ kfreebsd-source-8.0/sys/dev/ata/atapi-cd.h 2009-11-12 16:40:39.000000000 +0000
@@ -267,7 +267,7 @@
u_int8_t vendor_specific_byte1;
u_int8_t vendor_specific_byte2;
@@ -324,10 +321,10 @@
/* CDROM Read Track Information structure */
struct acd_track_info {
-Index: src/sys/dev/ciss/cissio.h
+Index: kfreebsd-source-8.0/sys/dev/ciss/cissio.h
===================================================================
---- src/sys/dev/ciss/cissio.h.orig
-+++ src/sys/dev/ciss/cissio.h
+--- kfreebsd-source-8.0.orig/sys/dev/ciss/cissio.h 2009-11-12 15:48:36.000000000 +0000
++++ kfreebsd-source-8.0/sys/dev/ciss/cissio.h 2009-11-12 16:40:39.000000000 +0000
@@ -108,18 +108,18 @@
u_int8_t Dev;
u_int8_t Bus:6;
@@ -430,11 +427,11 @@
+} __attribute__((__packed__)) IOCTL_Command_struct32;
#endif
- /*
-Index: src/sys/i386/include/segments.h
+ /************************************************************************
+Index: kfreebsd-source-8.0/sys/amd64/include/segments.h
===================================================================
---- src/sys/amd64/include/segments.h.orig
-+++ src/sys/amd64/include/segments.h
+--- kfreebsd-source-8.0.orig/sys/amd64/include/segments.h 2009-11-12 15:48:24.000000000 +0000
++++ kfreebsd-source-8.0/sys/amd64/include/segments.h 2009-11-12 16:40:39.000000000 +0000
@@ -72,7 +72,7 @@
u_int64_t sd_def32:1; /* default 32 vs 16 bit size */
u_int64_t sd_gran:1; /* limit granularity (byte/page units)*/
@@ -468,9 +465,9 @@
-} __packed;
+} __attribute__((__packed__));
- /* system segments and gate types */
- #define SDT_SYSNULL 0 /* system null */
-@@ -150,15 +150,15 @@
+ /*
+ * Generic descriptor
+@@ -167,15 +167,15 @@
unsigned long ssd_long:1; /* long mode (for %cs) */
unsigned long ssd_def32:1; /* default 32 vs 16 bit size */
unsigned long ssd_gran:1; /* limit granularity (byte/page units)*/
Modified: trunk/kfreebsd-kernel-headers/debian/patches/029_conf.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/029_conf.diff 2009-11-13 11:29:15 UTC (rev 2825)
+++ trunk/kfreebsd-kernel-headers/debian/patches/029_conf.diff 2009-11-13 13:38:14 UTC (rev 2826)
@@ -1,7 +1,7 @@
-Index: src/sys/sys/conf.h
+Index: kfreebsd-source-8.0/sys/sys/conf.h
===================================================================
---- src/sys/sys/conf.h.orig
-+++ src/sys/sys/conf.h
+--- kfreebsd-source-8.0.orig/sys/sys/conf.h 2009-11-12 15:49:02.000000000 +0000
++++ kfreebsd-source-8.0/sys/sys/conf.h 2009-11-12 16:43:24.000000000 +0000
@@ -43,6 +43,7 @@
#ifdef _KERNEL
#include <sys/eventhandler.h>
@@ -10,25 +10,25 @@
#include <sys/queue.h>
#endif
-@@ -263,17 +264,17 @@
+@@ -259,17 +260,17 @@
void dev_rel(struct cdev *dev);
void dev_strategy(struct cdev *dev, struct buf *bp);
- struct cdev *make_dev(struct cdevsw *_devsw, int _minor, uid_t _uid, gid_t _gid,
+ struct cdev *make_dev(struct cdevsw *_devsw, int _unit, uid_t _uid, gid_t _gid,
- int _perms, const char *_fmt, ...) __printflike(6, 7);
+ int _perms, const char *_fmt, ...);
- struct cdev *make_dev_cred(struct cdevsw *_devsw, int _minor,
+ struct cdev *make_dev_cred(struct cdevsw *_devsw, int _unit,
struct ucred *_cr, uid_t _uid, gid_t _gid, int _perms,
- const char *_fmt, ...) __printflike(7, 8);
+ const char *_fmt, ...);
#define MAKEDEV_REF 0x1
#define MAKEDEV_WHTOUT 0x2
struct cdev *make_dev_credf(int _flags,
- struct cdevsw *_devsw, int _minornr,
+ struct cdevsw *_devsw, int _unit,
struct ucred *_cr, uid_t _uid, gid_t _gid, int _mode,
- const char *_fmt, ...) __printflike(8, 9);
-struct cdev *make_dev_alias(struct cdev *_pdev, const char *_fmt, ...) __printflike(2, 3);
+ const char *_fmt, ...);
+struct cdev *make_dev_alias(struct cdev *_pdev, const char *_fmt, ...);
- int dev2unit(struct cdev *_dev);
void dev_lock(void);
void dev_unlock(void);
+ void setconf(void);
Modified: trunk/kfreebsd-kernel-headers/debian/patches/series
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/series 2009-11-13 11:29:15 UTC (rev 2825)
+++ trunk/kfreebsd-kernel-headers/debian/patches/series 2009-11-13 13:38:14 UTC (rev 2826)
@@ -1,29 +1,29 @@
-000_bruno_haible.diff -p1
+000_bruno_haible.diff
001_sys_soundcard.diff -p1
002_gdb.diff -p1
003_osreldate.diff -p1
004_stdint_h.diff -p1
-006_sys_tty_h.diff -p1
+006_sys_tty_h.diff
007_kvm.diff -p1
008_vm_vm_param_h.diff -p1
-009_inetutils.diff -p1
+009_inetutils.diff
010_glibc.diff -p1
-011_wine.diff -p1
+011_wine.diff
012_strace.diff -p1
-014_misc.diff -p1
-015_cam.diff -p1
+014_misc.diff
+015_cam.diff
018_sys__types.diff -p1
019_exec_pagesize.diff -p1
-020_concat_elf_generic.diff -p1
-021_machine__types.diff -p1
+020_concat_elf_generic.diff
+021_machine__types.diff
022_sys_buf_h.diff -p1
-023_packed.diff -p1
+023_packed.diff
024_ioccom.diff -p1
025_iconv.diff -p1
026_acpiio.diff -p1
027_ktrace.diff -p1
028_fbio.diff -p1
-029_conf.diff -p1
+029_conf.diff
030_pfvar.diff -p1
031_ufs.diff -p1
032_vnode.diff -p1
Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules 2009-11-13 11:29:15 UTC (rev 2825)
+++ trunk/kfreebsd-kernel-headers/debian/rules 2009-11-13 13:38:14 UTC (rev 2826)
@@ -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.2.tar.bz2
-SRC_DIR := kfreebsd-source-7.2
+SRC_TAR := /usr/src/kfreebsd-source-8.0.tar.bz2
+SRC_DIR := kfreebsd-source-8.0
clean:
dh_testdir
More information about the Glibc-bsd-commits
mailing list