[Glibc-bsd-commits] r2187 - in trunk/kfreebsd-kernel-headers/debian: . patches
ps-guest at alioth.debian.org
ps-guest at alioth.debian.org
Mon Jun 23 15:50:55 UTC 2008
Author: ps-guest
Date: 2008-06-23 15:50:54 +0000 (Mon, 23 Jun 2008)
New Revision: 2187
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/000_bruno_haible.diff
trunk/kfreebsd-kernel-headers/debian/patches/003_osreldate.diff
trunk/kfreebsd-kernel-headers/debian/patches/011_wine.diff
trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff
trunk/kfreebsd-kernel-headers/debian/patches/018_sys__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/030_pfvar.diff
trunk/kfreebsd-kernel-headers/debian/patches/031_ufs.diff
trunk/kfreebsd-kernel-headers/debian/rules
Log:
* preliminary kfreebsd-kernel-headers based on 7.0
Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog 2008-06-22 03:27:36 UTC (rev 2186)
+++ trunk/kfreebsd-kernel-headers/debian/changelog 2008-06-23 15:50:54 UTC (rev 2187)
@@ -1,3 +1,10 @@
+kfreebsd-kernel-headers (0.30) UNRELEASED; urgency=low
+
+ [ Petr Salinger ]
+ * Based on kfreebsd-source-7.0
+
+ -- Aurelien Jarno <aurel32 at debian.org> Mon, 23 Jun 2008 12:00:00 +0200
+
kfreebsd-kernel-headers (0.28) unreleased; urgency=low
[ Petr Salinger ]
Modified: trunk/kfreebsd-kernel-headers/debian/control
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/control 2008-06-22 03:27:36 UTC (rev 2186)
+++ trunk/kfreebsd-kernel-headers/debian/control 2008-06-23 15:50:54 UTC (rev 2187)
@@ -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-6.3
+Build-Depends: debhelper (>= 4.1.0), quilt, kfreebsd-source-7.0
Standards-Version: 3.7.3
Package: kfreebsd-kernel-headers
Modified: trunk/kfreebsd-kernel-headers/debian/includes.list
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/includes.list 2008-06-22 03:27:36 UTC (rev 2186)
+++ trunk/kfreebsd-kernel-headers/debian/includes.list 2008-06-23 15:50:54 UTC (rev 2187)
@@ -77,6 +77,7 @@
netinet/tcp_timer.h
netinet/tcp_var.h
netinet/udp_var.h
+netipsec
netipx/ipx.h
netipx/ipx_if.h
netipx/ipx_ip.h
Modified: trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff 2008-06-22 03:27:36 UTC (rev 2186)
+++ trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff 2008-06-23 15:50:54 UTC (rev 2187)
@@ -1,6 +1,7 @@
-diff -ur sys.orig/i386/include/npx.h sys/i386/include/npx.h
---- sys.orig/i386/include/npx.h 2004-12-07 23:50:18.000000000 +0100
-+++ sys/i386/include/npx.h 2004-12-07 23:48:32.000000000 +0100
+Index: sys/i386/include/npx.h
+===================================================================
+--- sys/i386/include/npx.h.orig
++++ sys/i386/include/npx.h
@@ -41,6 +41,8 @@
#ifndef _MACHINE_NPX_H_
#define _MACHINE_NPX_H_
@@ -10,9 +11,10 @@
/* Environment information of floating point unit */
struct env87 {
long en_cw; /* control word (16bits) */
-diff -ur sys.orig/i386/include/pcb.h sys/i386/include/pcb.h
---- sys.orig/i386/include/pcb.h 2004-12-07 23:50:18.000000000 +0100
-+++ sys/i386/include/pcb.h 2004-12-07 23:48:32.000000000 +0100
+Index: sys/i386/include/pcb.h
+===================================================================
+--- sys/i386/include/pcb.h.orig
++++ sys/i386/include/pcb.h
@@ -36,6 +36,8 @@
#ifndef _I386_PCB_H_
#define _I386_PCB_H_
@@ -22,10 +24,10 @@
/*
* Intel 386 process control block
*/
-
-diff -ur sys.orig/i386/include/pmap.h sys/i386/include/pmap.h
---- sys.orig/i386/include/pmap.h 2004-12-07 23:50:18.000000000 +0100
-+++ sys/i386/include/pmap.h 2004-12-07 23:48:32.000000000 +0100
+Index: sys/i386/include/pmap.h
+===================================================================
+--- sys/i386/include/pmap.h.orig
++++ sys/i386/include/pmap.h
@@ -44,6 +44,13 @@
#ifndef _MACHINE_PMAP_H_
#define _MACHINE_PMAP_H_
@@ -38,11 +40,12 @@
+#endif
+
/*
- * Page-directory and page-table entires follow this format, with a few
+ * 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.
-diff -ur sys.orig/net/if_arp.h sys/net/if_arp.h
---- sys.orig/net/if_arp.h 2004-12-07 23:50:18.000000000 +0100
-+++ sys/net/if_arp.h 2004-12-07 23:48:33.000000000 +0100
+Index: sys/net/if_arp.h
+===================================================================
+--- sys/net/if_arp.h.orig
++++ sys/net/if_arp.h
@@ -33,6 +33,11 @@
#ifndef _NET_IF_ARP_H_
#define _NET_IF_ARP_H_
@@ -71,9 +74,10 @@
/*
* ARP ioctl request
*/
-diff -ur sys.orig/net/if_dl.h sys/net/if_dl.h
---- sys.orig/net/if_dl.h 2004-12-07 23:50:18.000000000 +0100
-+++ sys/net/if_dl.h 2004-12-07 23:48:33.000000000 +0100
+Index: sys/net/if_dl.h
+===================================================================
+--- sys/net/if_dl.h.orig
++++ sys/net/if_dl.h
@@ -33,6 +33,10 @@
#ifndef _NET_IF_DL_H_
#define _NET_IF_DL_H_
@@ -103,9 +107,10 @@
-#endif /* !_KERNEL */
-
#endif
-diff -ur sys.orig/nfsclient/nfs.h sys/nfsclient/nfs.h
---- sys.orig/nfsclient/nfs.h 2004-12-07 23:50:18.000000000 +0100
-+++ sys/nfsclient/nfs.h 2004-12-07 23:48:35.000000000 +0100
+Index: sys/nfsclient/nfs.h
+===================================================================
+--- sys/nfsclient/nfs.h.orig
++++ sys/nfsclient/nfs.h
@@ -36,6 +36,11 @@
#ifndef _NFSCLIENT_NFS_H_
#define _NFSCLIENT_NFS_H_
@@ -118,9 +123,10 @@
#ifdef _KERNEL
#include "opt_nfs.h"
#endif
-diff -ur sys.orig/sys/callout.h sys/sys/callout.h
---- sys.orig/sys/callout.h 2004-12-07 23:50:18.000000000 +0100
-+++ sys/sys/callout.h 2004-12-07 23:48:37.000000000 +0100
+Index: sys/sys/callout.h
+===================================================================
+--- sys/sys/callout.h.orig
++++ sys/sys/callout.h
@@ -38,6 +38,8 @@
#ifndef _SYS_CALLOUT_H_
#define _SYS_CALLOUT_H_
@@ -129,10 +135,11 @@
+
#include <sys/queue.h>
- SLIST_HEAD(callout_list, callout);
-diff -ur sys.orig/sys/dvdio.h sys/sys/dvdio.h
---- sys.orig/sys/dvdio.h 2004-12-07 23:50:18.000000000 +0100
-+++ sys/sys/dvdio.h 2004-12-07 23:48:37.000000000 +0100
+ struct mtx;
+Index: sys/sys/dvdio.h
+===================================================================
+--- sys/sys/dvdio.h.orig
++++ sys/sys/dvdio.h
@@ -31,6 +31,8 @@
#ifndef _SYS_DVDIO_H_
#define _SYS_DVDIO_H_
@@ -142,10 +149,11 @@
struct dvd_layer {
u_int8_t book_type :4;
u_int8_t book_version :4;
-diff -ur sys.orig/sys/extattr.h sys/sys/extattr.h
---- sys.orig/sys/extattr.h 2004-12-07 23:50:18.000000000 +0100
-+++ sys/sys/extattr.h 2004-12-07 23:48:37.000000000 +0100
-@@ -50,36 +50,36 @@
+Index: sys/sys/extattr.h
+===================================================================
+--- sys/sys/extattr.h.orig
++++ sys/sys/extattr.h
+@@ -67,36 +67,36 @@
struct ucred *cred, struct thread *td, int access);
#else
@@ -208,9 +216,10 @@
__END_DECLS
#endif /* !_KERNEL */
-diff -ur sys.orig/sys/filedesc.h sys/sys/filedesc.h
---- sys.orig/sys/filedesc.h 2004-12-07 23:50:18.000000000 +0100
-+++ sys/sys/filedesc.h 2004-12-07 23:48:37.000000000 +0100
+Index: sys/sys/filedesc.h
+===================================================================
+--- sys/sys/filedesc.h.orig
++++ sys/sys/filedesc.h
@@ -33,6 +33,7 @@
#ifndef _SYS_FILEDESC_H_
#define _SYS_FILEDESC_H_
@@ -218,10 +227,11 @@
+#include <sys/types.h>
#include <sys/queue.h>
#include <sys/event.h>
- #include <sys/_lock.h>
-diff -ur sys.orig/sys/jail.h sys/sys/jail.h
---- sys.orig/sys/jail.h 2004-12-07 23:50:18.000000000 +0100
-+++ sys/sys/jail.h 2004-12-07 23:48:37.000000000 +0100
+ #include <sys/lock.h>
+Index: sys/sys/jail.h
+===================================================================
+--- sys/sys/jail.h.orig
++++ sys/sys/jail.h
@@ -13,6 +13,10 @@
#ifndef _SYS_JAIL_H_
#define _SYS_JAIL_H_
@@ -246,13 +256,14 @@
#else /* _KERNEL */
-diff -ur sys.orig/sys/linker.h sys/sys/linker.h
---- sys.orig/sys/linker.h 2004-12-07 23:50:18.000000000 +0100
-+++ sys/sys/linker.h 2004-12-07 23:48:37.000000000 +0100
-@@ -172,6 +172,13 @@
- int linker_ddb_symbol_values(c_linker_sym_t _sym, linker_symval_t *_symval);
+Index: sys/sys/linker.h
+===================================================================
+--- sys/sys/linker.h.orig
++++ sys/sys/linker.h
+@@ -168,6 +168,13 @@
+ /* HWPMC helper */
+ void *linker_hwpmc_list_objects(void);
-
+#else
+
+#include <features.h>
@@ -263,7 +274,7 @@
#endif /* _KERNEL */
/*
-@@ -287,14 +300,13 @@
+@@ -283,14 +290,13 @@
#include <sys/cdefs.h>
__BEGIN_DECLS
@@ -285,9 +296,10 @@
__END_DECLS
#endif
-diff -ur sys.orig/sys/lock.h sys/sys/lock.h
---- sys.orig/sys/lock.h 2004-12-07 23:50:18.000000000 +0100
-+++ sys/sys/lock.h 2004-12-07 23:48:37.000000000 +0100
+Index: sys/sys/lock.h
+===================================================================
+--- sys/sys/lock.h.orig
++++ sys/sys/lock.h
@@ -32,6 +32,7 @@
#ifndef _SYS_LOCK_H_
#define _SYS_LOCK_H_
@@ -296,11 +308,12 @@
#include <sys/queue.h>
#include <sys/_lock.h>
-diff -ur sys.orig/sys/memrange.h sys/sys/memrange.h
---- sys.orig/sys/memrange.h 2004-12-07 23:50:18.000000000 +0100
-+++ sys/sys/memrange.h 2004-12-07 23:48:37.000000000 +0100
+Index: sys/sys/memrange.h
+===================================================================
+--- sys/sys/memrange.h.orig
++++ sys/sys/memrange.h
@@ -4,6 +4,11 @@
- * $FreeBSD: sys/sys/memrange.h,v 1.7 2004/08/04 18:30:31 markm Exp $
+ * $FreeBSD: src/sys/sys/memrange.h,v 1.7 2004/08/04 18:30:31 markm Exp $
*/
+#ifndef _SYS_MEMRANGE_H_
@@ -316,9 +329,10 @@
#endif
+#endif /* _SYS_MEMRANGE_H_ */
-diff -ur sys.orig/sys/pciio.h sys/sys/pciio.h
---- sys.orig/sys/pciio.h 2004-12-07 23:50:18.000000000 +0100
-+++ sys/sys/pciio.h 2004-12-07 23:48:37.000000000 +0100
+Index: sys/sys/pciio.h
+===================================================================
+--- sys/sys/pciio.h.orig
++++ sys/sys/pciio.h
@@ -31,6 +31,7 @@
#ifndef _SYS_PCIIO_H_
#define _SYS_PCIIO_H_
@@ -327,9 +341,10 @@
#include <sys/ioccom.h>
#define PCI_MAXNAMELEN 16
-diff -ur sys.orig/sys/procfs.h sys/sys/procfs.h
---- sys.orig/sys/procfs.h 2004-12-07 23:50:18.000000000 +0100
-+++ sys/sys/procfs.h 2004-12-07 23:48:37.000000000 +0100
+Index: sys/sys/procfs.h
+===================================================================
+--- sys/sys/procfs.h.orig
++++ sys/sys/procfs.h
@@ -82,4 +82,8 @@
typedef void *psaddr_t; /* An address in the target process. */
@@ -339,9 +354,10 @@
+typedef __pid_t lwpid_t;
+
#endif /* _SYS_PROCFS_H_ */
-diff -ur sys.orig/sys/resourcevar.h sys/sys/resourcevar.h
---- sys.orig/sys/resourcevar.h 2004-12-07 23:50:18.000000000 +0100
-+++ sys/sys/resourcevar.h 2004-12-07 23:48:38.000000000 +0100
+Index: sys/sys/resourcevar.h
+===================================================================
+--- sys/sys/resourcevar.h.orig
++++ sys/sys/resourcevar.h
@@ -35,6 +35,8 @@
#include <sys/resource.h>
@@ -351,9 +367,10 @@
#ifdef _KERNEL
#include <sys/_lock.h>
#include <sys/_mutex.h>
-diff -ur sys.orig/sys/rtprio.h sys/sys/rtprio.h
---- sys.orig/sys/rtprio.h 2004-12-07 23:50:18.000000000 +0100
-+++ sys/sys/rtprio.h 2004-12-07 23:48:38.000000000 +0100
+Index: sys/sys/rtprio.h
+===================================================================
+--- sys/sys/rtprio.h.orig
++++ sys/sys/rtprio.h
@@ -36,6 +36,10 @@
#include <sys/priority.h>
@@ -373,9 +390,9 @@
/*
* Scheduling class information.
*/
-@@ -79,13 +82,15 @@
- int rtp_to_pri(struct rtprio *, struct ksegrp *);
- void pri_to_rtp(struct ksegrp *, struct rtprio *);
+@@ -79,14 +82,15 @@
+ int rtp_to_pri(struct rtprio *, struct thread *);
+ void pri_to_rtp(struct thread *, struct rtprio *);
#endif
-#endif
@@ -384,16 +401,18 @@
__BEGIN_DECLS
-int rtprio(int, pid_t, struct rtprio *);
-+extern int rtprio(int, pid_t, struct rtprio *) __THROW;
+-int rtprio_thread(int, lwpid_t, struct rtprio *);
++extern int rtprio(int, pid_t, struct rtprio *) __THROW;
+#ifdef _LIBC
-+extern int __rtprio(int, pid_t, struct rtprio *);
++extern int __rtprio(int, pid_t, struct rtprio *);
+ __END_DECLS
+#endif
- __END_DECLS
#endif /* !_KERNEL */
#endif /* !_SYS_RTPRIO_H_ */
-diff -ur sys.orig/sys/signalvar.h sys/sys/signalvar.h
---- sys.orig/sys/signalvar.h 2004-12-07 23:50:18.000000000 +0100
-+++ sys/sys/signalvar.h 2004-12-07 23:48:38.000000000 +0100
+Index: sys/sys/signalvar.h
+===================================================================
+--- sys/sys/signalvar.h.orig
++++ sys/sys/signalvar.h
@@ -43,6 +43,9 @@
* not exported to user programs.
*/
@@ -408,8 +427,8 @@
typedef void __osiginfohandler_t(int, osiginfo_t *, void *);
#endif /* _KERNEL && COMPAT_43 */
++#if 0
+#endif
-+
/* additional signal action values, used only temporarily/internally */
#define SIG_CATCH ((__sighandler_t *)2)
#define SIG_HOLD ((__sighandler_t *)3)
@@ -437,9 +456,19 @@
return (0);
}
return (1);
-diff -ur sys.orig/sys/sysctl.h sys/sys/sysctl.h
---- sys.orig/sys/sysctl.h 2004-12-07 23:50:18.000000000 +0100
-+++ sys/sys/sysctl.h 2004-12-07 23:48:38.000000000 +0100
+@@ -215,6 +214,8 @@
+ union sigval sigev_value; /* Signal value */
+ };
+
++#endif
++
+ typedef struct ksiginfo {
+ TAILQ_ENTRY(ksiginfo) ksi_link;
+ siginfo_t ksi_info;
+Index: sys/sys/sysctl.h
+===================================================================
+--- sys/sys/sysctl.h.orig
++++ sys/sys/sysctl.h
@@ -36,7 +36,103 @@
#ifndef _SYS_SYSCTL_H_
#define _SYS_SYSCTL_H_
@@ -545,7 +574,7 @@
struct thread;
/*
-@@ -336,7 +432,7 @@
+@@ -366,7 +462,7 @@
#define KERN_SECURELVL 9 /* int: system security level */
#define KERN_HOSTNAME 10 /* string: hostname */
#define KERN_HOSTID 11 /* int: host identifier */
@@ -554,7 +583,7 @@
#define KERN_VNODE 13 /* struct: vnode structures */
#define KERN_PROC 14 /* struct: process entries */
#define KERN_FILE 15 /* struct: file entries */
-@@ -629,13 +725,19 @@
+@@ -676,13 +772,19 @@
int sysctl_wire_old_buffer(struct sysctl_req *req, size_t len);
#else /* !_KERNEL */
@@ -578,10 +607,11 @@
#endif /* _KERNEL */
#endif /* !_SYS_SYSCTL_H_ */
-diff -ur sys.orig/sys/syslimits.h sys/sys/syslimits.h
---- sys.orig/sys/syslimits.h 2004-12-07 23:50:18.000000000 +0100
-+++ sys/sys/syslimits.h 2004-12-07 23:48:38.000000000 +0100
-@@ -51,7 +51,9 @@
+Index: sys/sys/syslimits.h
+===================================================================
+--- sys/sys/syslimits.h.orig
++++ 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 */
@@ -591,9 +621,10 @@
#ifndef OPEN_MAX
#define OPEN_MAX 64 /* max open files per process */
#endif
-diff -ur sys.orig/sys/timepps.h sys/sys/timepps.h
---- sys.orig/sys/timepps.h 2004-12-07 23:50:18.000000000 +0100
-+++ sys/sys/timepps.h 2004-12-07 23:48:38.000000000 +0100
+Index: sys/sys/timepps.h
+===================================================================
+--- sys/sys/timepps.h.orig
++++ sys/sys/timepps.h
@@ -15,6 +15,8 @@
#ifndef _SYS_TIMEPPS_H_
#define _SYS_TIMEPPS_H_
@@ -603,10 +634,11 @@
#include <sys/ioccom.h>
#include <sys/time.h>
-diff -ur sys.orig/sys/timex.h sys/sys/timex.h
---- sys.orig/sys/timex.h 2004-12-07 23:50:18.000000000 +0100
-+++ sys/sys/timex.h 2004-12-07 23:48:38.000000000 +0100
-@@ -94,11 +94,9 @@
+Index: sys/sys/timex.h
+===================================================================
+--- sys/sys/timex.h.orig
++++ sys/sys/timex.h
+@@ -95,11 +95,9 @@
*/
#ifndef _SYS_TIMEX_H_
#define _SYS_TIMEX_H_ 1
@@ -620,7 +652,7 @@
/*
* The following defines establish the performance envelope of the
-@@ -175,7 +173,13 @@
+@@ -176,7 +174,13 @@
* Note: The time member is in microseconds if STA_NANO is zero and
* nanoseconds if not.
*/
@@ -635,7 +667,7 @@
struct timespec time; /* current time (ns) (ro) */
long maxerror; /* maximum error (us) (ro) */
long esterror; /* estimated error (us) (ro) */
-@@ -224,9 +228,12 @@
+@@ -225,9 +229,12 @@
#else /* !_KERNEL */
#include <sys/cdefs.h>
@@ -650,22 +682,24 @@
__END_DECLS
#endif /* _KERNEL */
-diff -ur sys.orig/sys/ucred.h sys/sys/ucred.h
---- sys.orig/sys/ucred.h 2004-12-07 23:50:18.000000000 +0100
-+++ sys/sys/ucred.h 2004-12-07 23:48:38.000000000 +0100
-@@ -33,6 +33,9 @@
- #ifndef _SYS_UCRED_H_
- #define _SYS_UCRED_H_
+Index: sys/sys/ucred.h
+===================================================================
+--- sys/sys/ucred.h.orig
++++ sys/sys/ucred.h
+@@ -35,6 +35,9 @@
+ #include <bsm/audit.h>
+
+#include <sys/types.h>
+#include <sys/param.h>
+
/*
* Credentials.
*
-diff -ur sys.orig/sys/xrpuio.h sys/sys/xrpuio.h
---- sys.orig/sys/xrpuio.h 2004-12-07 23:50:18.000000000 +0100
-+++ sys/sys/xrpuio.h 2004-12-07 23:48:38.000000000 +0100
+Index: sys/sys/xrpuio.h
+===================================================================
+--- sys/sys/xrpuio.h.orig
++++ sys/sys/xrpuio.h
@@ -13,6 +13,7 @@
#ifndef _SYS_XRPUIO_H_
#define _SYS_XRPUIO_H_
@@ -674,9 +708,10 @@
#include <sys/ioccom.h>
#define XRPU_MAX_PPS 16
-diff -ur sys.orig/vm/vm.h sys/vm/vm.h
---- sys.orig/vm/vm.h 2004-12-07 23:50:18.000000000 +0100
-+++ sys/vm/vm.h 2004-12-07 23:48:38.000000000 +0100
+Index: sys/vm/vm.h
+===================================================================
+--- sys/vm/vm.h.orig
++++ sys/vm/vm.h
@@ -61,6 +61,8 @@
#ifndef VM_H
#define VM_H
@@ -686,9 +721,10 @@
typedef char vm_inherit_t; /* inheritance codes */
#define VM_INHERIT_SHARE ((vm_inherit_t) 0)
-diff -ur sys.orig/vm/vm_map.h sys/vm/vm_map.h
---- sys.orig/vm/vm_map.h 2004-12-07 23:50:18.000000000 +0100
-+++ sys/vm/vm_map.h 2004-12-07 23:48:38.000000000 +0100
+Index: sys/vm/vm_map.h
+===================================================================
+--- sys/vm/vm_map.h.orig
++++ sys/vm/vm_map.h
@@ -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 2008-06-22 03:27:36 UTC (rev 2186)
+++ trunk/kfreebsd-kernel-headers/debian/patches/003_osreldate.diff 2008-06-23 15:50:54 UTC (rev 2187)
@@ -3,7 +3,7 @@
+++ sys/osreldate.h 2004-08-03 02:21:30.000000000 +0200
@@ -0,0 +1,12 @@
+
-+/* kFreeBSD 6.1 headers */
++/* kFreeBSD 7.0 headers */
+
+#include <sys/cdefs.h>
+#ifndef _SYS_CDEFS_H_
@@ -11,6 +11,6 @@
+#endif
+
+#undef __FreeBSD_kernel__
-+#define __FreeBSD_kernel__ 6
-+#define __FreeBSD_kernel_version 602000
++#define __FreeBSD_kernel__ 7
++#define __FreeBSD_kernel_version 700055
+
Modified: trunk/kfreebsd-kernel-headers/debian/patches/011_wine.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/011_wine.diff 2008-06-22 03:27:36 UTC (rev 2186)
+++ trunk/kfreebsd-kernel-headers/debian/patches/011_wine.diff 2008-06-23 15:50:54 UTC (rev 2187)
@@ -1,7 +1,7 @@
Index: sys/i386/include/segments.h
===================================================================
---- sys/i386/include/segments.h.orig 2006-08-25 10:54:25.882289000 +0200
-+++ sys/i386/include/segments.h 2006-08-25 10:56:35.000000000 +0200
+--- sys/i386/include/segments.h.orig
++++ sys/i386/include/segments.h
@@ -60,7 +60,7 @@
*/
struct segment_descriptor {
@@ -22,9 +22,9 @@
/*
Index: sys/sys/elf32.h
===================================================================
---- sys/sys/elf32.h.orig 2006-08-25 10:54:25.903945000 +0200
-+++ sys/sys/elf32.h 2006-08-25 11:05:18.000000000 +0200
-@@ -35,11 +35,8 @@
+--- sys/sys/elf32.h.orig
++++ sys/sys/elf32.h
+@@ -35,11 +35,9 @@
* ELF definitions common to all 32-bit architectures.
*/
@@ -35,10 +35,11 @@
-typedef uint32_t Elf32_Word;
+#include <elf.h>
+
++
+ typedef uint64_t Elf32_Lword;
typedef Elf32_Word Elf32_Hashelt;
-
-@@ -47,117 +44,4 @@
+@@ -48,198 +46,4 @@
typedef Elf32_Word Elf32_Size;
typedef Elf32_Sword Elf32_Ssize;
@@ -133,6 +134,44 @@
-#define ELF32_R_INFO(sym, type) (((sym) << 8) + (unsigned char)(type))
-
-/*
+- * Note entry header
+- */
+-typedef Elf_Note Elf32_Nhdr;
+-
+-/*
+- * Move entry
+- */
+-typedef struct {
+- Elf32_Lword m_value; /* symbol value */
+- Elf32_Word m_info; /* size + index */
+- Elf32_Word m_poffset; /* symbol offset */
+- Elf32_Half m_repeat; /* repeat count */
+- Elf32_Half m_stride; /* stride info */
+-} Elf32_Move;
+-
+-/*
+- * The macros compose and decompose values for Move.r_info
+- *
+- * sym = ELF32_M_SYM(M.m_info)
+- * size = ELF32_M_SIZE(M.m_info)
+- * M.m_info = ELF32_M_INFO(sym, size)
+- */
+-#define ELF32_M_SYM(info) ((info)>>8)
+-#define ELF32_M_SIZE(info) ((unsigned char)(info))
+-#define ELF32_M_INFO(sym, size) (((sym)<<8)+(unsigned char)(size))
+-
+-/*
+- * Hardware/Software capabilities entry
+- */
+-typedef struct {
+- Elf32_Word c_tag; /* how to interpret value */
+- union {
+- Elf32_Word c_val;
+- Elf32_Addr c_ptr;
+- } c_un;
+-} Elf32_Cap;
+-
+-/*
- * Symbol table entries.
- */
-
@@ -155,12 +194,55 @@
-/* Macro for accessing the fields of st_other. */
-#define ELF32_ST_VISIBILITY(oth) ((oth) & 0x3)
-
+-/* Structures used by Sun & GNU symbol versioning. */
+-typedef struct
+-{
+- Elf32_Half vd_version;
+- Elf32_Half vd_flags;
+- Elf32_Half vd_ndx;
+- Elf32_Half vd_cnt;
+- Elf32_Word vd_hash;
+- Elf32_Word vd_aux;
+- Elf32_Word vd_next;
+-} Elf32_Verdef;
+-
+-typedef struct
+-{
+- Elf32_Word vda_name;
+- Elf32_Word vda_next;
+-} Elf32_Verdaux;
+-
+-typedef struct
+-{
+- Elf32_Half vn_version;
+- Elf32_Half vn_cnt;
+- Elf32_Word vn_file;
+- Elf32_Word vn_aux;
+- Elf32_Word vn_next;
+-} Elf32_Verneed;
+-
+-typedef struct
+-{
+- Elf32_Word vna_hash;
+- Elf32_Half vna_flags;
+- Elf32_Half vna_other;
+- Elf32_Word vna_name;
+- Elf32_Word vna_next;
+-} Elf32_Vernaux;
+-
+-typedef Elf32_Half Elf32_Versym;
+-
+-typedef struct {
+- Elf32_Half si_boundto; /* direct bindings - symbol bound to */
+- Elf32_Half si_flags; /* per symbol flags */
+-} Elf32_Syminfo;
+-
#endif /* !_SYS_ELF32_H_ */
Index: sys/sys/elf64.h
===================================================================
---- sys/sys/elf64.h.orig 2006-08-25 10:54:25.925997000 +0200
-+++ sys/sys/elf64.h 2006-08-25 11:09:37.000000000 +0200
-@@ -35,13 +35,7 @@
+--- sys/sys/elf64.h.orig
++++ sys/sys/elf64.h
+@@ -35,14 +35,10 @@
* ELF definitions common to all 64-bit architectures.
*/
@@ -170,12 +252,15 @@
-typedef int32_t Elf64_Sword;
-typedef int64_t Elf64_Sxword;
-typedef uint32_t Elf64_Word;
++#include <elf.h>
++
++
+ typedef uint64_t Elf64_Lword;
-typedef uint64_t Elf64_Xword;
-+#include <elf.h>
/*
* Types of dynamic symbol hash table bucket and chain elements.
-@@ -60,117 +54,4 @@
+@@ -57,192 +53,4 @@
typedef Elf64_Xword Elf64_Size;
typedef Elf64_Sxword Elf64_Ssize;
@@ -269,7 +354,43 @@
-/* Macro for constructing r_info from field values. */
-#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))
+-
-/*
+- * Note entry header
+- */
+-typedef Elf_Note Elf64_Nhdr;
+-
+-/*
+- * Move entry
+- */
+-typedef struct {
+- Elf64_Lword m_value; /* symbol value */
+- Elf64_Xword m_info; /* size + index */
+- Elf64_Xword m_poffset; /* symbol offset */
+- Elf64_Half m_repeat; /* repeat count */
+- Elf64_Half m_stride; /* stride info */
+-} Elf64_Move;
+-
+-#define ELF64_M_SYM(info) ((info)>>8)
+-#define ELF64_M_SIZE(info) ((unsigned char)(info))
+-#define ELF64_M_INFO(sym, size) (((sym)<<8)+(unsigned char)(size))
+-
+-/*
+- * Hardware/Software capabilities entry
+- */
+-typedef struct {
+- Elf64_Xword c_tag; /* how to interpret value */
+- union {
+- Elf64_Xword c_val;
+- Elf64_Addr c_ptr;
+- } c_un;
+-} Elf64_Cap;
+-
+-/*
- * Symbol table entries.
- */
-
@@ -292,11 +413,50 @@
-/* Macro for accessing the fields of st_other. */
-#define ELF64_ST_VISIBILITY(oth) ((oth) & 0x3)
-
+-/* Structures used by Sun & GNU-style symbol versioning. */
+-typedef struct {
+- Elf64_Half vd_version;
+- Elf64_Half vd_flags;
+- Elf64_Half vd_ndx;
+- Elf64_Half vd_cnt;
+- Elf64_Word vd_hash;
+- Elf64_Word vd_aux;
+- Elf64_Word vd_next;
+-} Elf64_Verdef;
+-
+-typedef struct {
+- Elf64_Word vda_name;
+- Elf64_Word vda_next;
+-} Elf64_Verdaux;
+-
+-typedef struct {
+- Elf64_Half vn_version;
+- Elf64_Half vn_cnt;
+- Elf64_Word vn_file;
+- Elf64_Word vn_aux;
+- Elf64_Word vn_next;
+-} Elf64_Verneed;
+-
+-typedef struct {
+- Elf64_Word vna_hash;
+- Elf64_Half vna_flags;
+- Elf64_Half vna_other;
+- Elf64_Word vna_name;
+- Elf64_Word vna_next;
+-} Elf64_Vernaux;
+-
+-typedef Elf64_Half Elf64_Versym;
+-
+-typedef struct {
+- Elf64_Half si_boundto; /* direct bindings - symbol bound to */
+- Elf64_Half si_flags; /* per symbol flags */
+-} Elf64_Syminfo;
+-
#endif /* !_SYS_ELF64_H_ */
Index: sys/sys/elf_common.h
===================================================================
---- sys/sys/elf_common.h.orig 2006-08-25 10:54:25.958082000 +0200
-+++ sys/sys/elf_common.h 2006-08-25 10:56:35.000000000 +0200
+--- sys/sys/elf_common.h.orig
++++ sys/sys/elf_common.h
@@ -29,6 +29,8 @@
#ifndef _SYS_ELF_COMMON_H_
#define _SYS_ELF_COMMON_H_ 1
@@ -318,4 +478,4 @@
+ uint32_t n_type; /* Type of this note. */
} Elf_Note;
- /* Indexes into the e_ident array. Keep synced with
+ /* Indexes into the e_ident array. Keep synced with
Modified: trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff 2008-06-22 03:27:36 UTC (rev 2186)
+++ trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff 2008-06-23 15:50:54 UTC (rev 2187)
@@ -1,6 +1,7 @@
-diff -ur sys.old/cam/scsi/scsi_all.h sys/cam/scsi/scsi_all.h
---- sys.old/cam/scsi/scsi_all.h 2005-08-17 16:33:28.000000000 +0200
-+++ sys/cam/scsi/scsi_all.h 2005-08-22 23:13:47.000000000 +0200
+Index: sys/cam/scsi/scsi_all.h
+===================================================================
+--- sys/cam/scsi/scsi_all.h.orig
++++ sys/cam/scsi/scsi_all.h
@@ -25,6 +25,7 @@
#define _SCSI_SCSI_ALL_H 1
@@ -9,9 +10,10 @@
#ifdef _KERNEL
/*
-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
+Index: sys/i386/include/md_var.h
+===================================================================
+--- sys/i386/include/md_var.h.orig
++++ sys/i386/include/md_var.h
@@ -32,6 +32,8 @@
#ifndef _MACHINE_MD_VAR_H_
#define _MACHINE_MD_VAR_H_
@@ -21,9 +23,10 @@
/*
* Miscellaneous machine-dependent declarations.
*/
-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
+Index: sys/amd64/include/md_var.h
+===================================================================
+--- sys/amd64/include/md_var.h.orig
++++ sys/amd64/include/md_var.h
@@ -32,6 +32,8 @@
#ifndef _MACHINE_MD_VAR_H_
#define _MACHINE_MD_VAR_H_
@@ -33,19 +36,10 @@
/*
* Miscellaneous machine-dependent declarations.
*/
-@@ -55,7 +55,9 @@
- extern char sigcode[];
- extern int szsigcode;
-
-+#ifdef _KERNEL
- extern struct pcpu __pcpu[];
-+#endif
-
- typedef void alias_for_inthand_t(u_int cs, u_int ef, u_int esp, u_int ss);
- struct thread;
-diff -ur sys.old/sys/_mutex.h sys/sys/_mutex.h
---- sys.old/sys/_mutex.h 2005-08-17 16:32:18.000000000 +0200
-+++ sys/sys/_mutex.h 2005-08-22 23:13:47.000000000 +0200
+Index: sys/sys/_mutex.h
+===================================================================
+--- sys/sys/_mutex.h.orig
++++ sys/sys/_mutex.h
@@ -31,6 +31,8 @@
#ifndef _SYS__MUTEX_H_
#define _SYS__MUTEX_H_
@@ -55,10 +49,19 @@
/*
* Sleep/spin mutex.
*/
-diff -ur sys.old/sys/_timeval.h sys/sys/_timeval.h
---- sys.old/sys/_timeval.h 2005-08-17 16:32:17.000000000 +0200
-+++ sys/sys/_timeval.h 2005-08-22 23:13:47.000000000 +0200
-@@ -41,16 +41,6 @@
+Index: sys/sys/_timeval.h
+===================================================================
+--- sys/sys/_timeval.h.orig
++++ sys/sys/_timeval.h
+@@ -30,6 +30,7 @@
+ #define _SYS__TIMEVAL_H_
+
+ #include <sys/_types.h>
++#include <sys/time.h>
+
+ #ifndef _SUSECONDS_T_DECLARED
+ typedef __suseconds_t suseconds_t;
+@@ -41,12 +42,4 @@
#define _TIME_T_DECLARED
#endif
@@ -66,38 +69,35 @@
- * Structure returned by gettimeofday(2) system call, and used in other calls.
- */
-struct timeval {
--#ifdef __arm__
-- time_t tv_sec;
--#else
-- long tv_sec; /* seconds (XXX should be time_t) */
--#endif
+- time_t tv_sec; /* seconds */
- suseconds_t tv_usec; /* and microseconds */
-};
-+#include <sys/time.h>
-
+-
#endif /* !_SYS__TIMEVAL_H_ */
-diff -ur sys.old/sys/bio.h sys/sys/bio.h
---- sys.old/sys/bio.h 2005-08-17 16:32:17.000000000 +0200
-+++ sys/sys/bio.h 2005-08-22 23:13:48.000000000 +0200
+Index: sys/sys/bio.h
+===================================================================
+--- sys/sys/bio.h.orig
++++ sys/sys/bio.h
@@ -39,6 +39,15 @@
#define _SYS_BIO_H_
#include <sys/queue.h>
+#include <stdint.h>
-+/* FIXME: this struct is copied from BSDish sys/time.h. It should be somewhere else. (maybe Glibc?) */
-+#ifndef bintime
-+#define bintime bintime
-+struct bintime {
-+ time_t sec;
-+ uint64_t frac;
-+};
-+#endif
++/* FIXME: this struct is copied from BSDish sys/time.h. It should be somewhere else. (maybe Glibc?) */
++#ifndef bintime
++#define bintime bintime
++struct bintime {
++ time_t sec;
++ uint64_t frac;
++};
++#endif
struct disk;
struct bio;
-diff -ur sys.old/sys/devicestat.h sys/sys/devicestat.h
---- sys.old/sys/devicestat.h 2005-08-17 16:32:17.000000000 +0200
-+++ sys/sys/devicestat.h 2005-08-22 23:13:48.000000000 +0200
+Index: sys/sys/devicestat.h
+===================================================================
+--- sys/sys/devicestat.h.orig
++++ sys/sys/devicestat.h
@@ -32,7 +32,15 @@
#define _DEVICESTAT_H
@@ -115,9 +115,10 @@
/*
* XXX: Should really be SPECNAMELEN
-diff -ur sys.old/sys/sbuf.h sys/sys/sbuf.h
---- sys.old/sys/sbuf.h 2005-08-17 16:32:16.000000000 +0200
-+++ sys/sys/sbuf.h 2005-08-22 23:13:47.000000000 +0200
+Index: sys/sys/sbuf.h
+===================================================================
+--- sys/sys/sbuf.h.orig
++++ sys/sys/sbuf.h
@@ -62,8 +62,8 @@
int sbuf_bcpy(struct sbuf *, const void *, size_t);
int sbuf_cat(struct sbuf *, const char *);
@@ -129,9 +130,10 @@
int sbuf_putc(struct sbuf *, int);
int sbuf_trim(struct sbuf *);
int sbuf_overflowed(struct sbuf *);
-diff -ur sys.old/sys/timespec.h sys/sys/timespec.h
---- sys.old/sys/timespec.h 2005-08-17 16:32:16.000000000 +0200
-+++ sys/sys/timespec.h 2005-08-22 23:13:48.000000000 +0200
+Index: sys/sys/timespec.h
+===================================================================
+--- sys/sys/timespec.h.orig
++++ sys/sys/timespec.h
@@ -43,10 +43,7 @@
#define _TIME_T_DECLARED
#endif
Modified: trunk/kfreebsd-kernel-headers/debian/patches/018_sys__types.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/018_sys__types.diff 2008-06-22 03:27:36 UTC (rev 2186)
+++ trunk/kfreebsd-kernel-headers/debian/patches/018_sys__types.diff 2008-06-23 15:50:54 UTC (rev 2187)
@@ -1,5 +1,13 @@
--- sys/sys/_types.h.orig 2005-10-11 01:30:09.000000000 +0200
+++ sys/sys/_types.h 2005-12-13 20:13:11.000000000 +0100
+@@ -62,7 +62,6 @@
+ typedef __uint8_t __sa_family_t;
+ typedef __uint32_t __socklen_t;
+ typedef long __suseconds_t; /* microseconds (signed) */
+-typedef struct __timer *__timer_t; /* timer_gettime()... */
+ typedef struct __mq *__mqd_t; /* mq_open()... */
+ typedef __uint32_t __uid_t;
+ typedef unsigned int __useconds_t; /* microseconds (unsigned) */
@@ -82,4 +82,59 @@
typedef __uint32_t __fixpt_t; /* fixed point number */
Modified: trunk/kfreebsd-kernel-headers/debian/patches/023_packed.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/023_packed.diff 2008-06-22 03:27:36 UTC (rev 2186)
+++ trunk/kfreebsd-kernel-headers/debian/patches/023_packed.diff 2008-06-23 15:50:54 UTC (rev 2187)
@@ -1,188 +1,299 @@
---- sys/net80211/ieee80211.h.orig 2006-04-30 04:21:55.000000000 +0200
-+++ sys/net80211/ieee80211.h 2006-04-30 13:28:41.000000000 +0200
-@@ -50,7 +50,7 @@
- u_int8_t i_service;
- u_int16_t i_length;
- u_int16_t i_crc;
+Index: sys/net80211/ieee80211.h
+===================================================================
+--- sys/net80211/ieee80211.h.orig
++++ sys/net80211/ieee80211.h
+@@ -44,7 +44,7 @@
+ uint8_t i_service;
+ uint16_t i_length;
+ uint16_t i_crc;
-} __packed;
-+} __attribute__ ((packed));
++} __attribute__((__packed__));
#define IEEE80211_PLCP_SFD 0xF3A0
#define IEEE80211_PLCP_SERVICE 0x00
-@@ -67,7 +67,7 @@
- u_int8_t i_seq[2];
+@@ -61,7 +61,7 @@
+ uint8_t i_seq[2];
/* possibly followed by addr4[IEEE80211_ADDR_LEN]; */
/* see below */
-} __packed;
-+} __attribute__ ((packed));
++} __attribute__((__packed__));
struct ieee80211_qosframe {
- u_int8_t i_fc[2];
-@@ -79,7 +79,7 @@
- u_int8_t i_qos[2];
+ uint8_t i_fc[2];
+@@ -73,7 +73,7 @@
+ uint8_t i_qos[2];
/* possibly followed by addr4[IEEE80211_ADDR_LEN]; */
/* see below */
-} __packed;
-+} __attribute__ ((packed));
++} __attribute__((__packed__));
struct ieee80211_qoscntl {
- u_int8_t i_qos[2];
-@@ -93,7 +93,7 @@
- u_int8_t i_addr3[IEEE80211_ADDR_LEN];
- u_int8_t i_seq[2];
- u_int8_t i_addr4[IEEE80211_ADDR_LEN];
+ uint8_t i_qos[2];
+@@ -87,7 +87,7 @@
+ uint8_t i_addr3[IEEE80211_ADDR_LEN];
+ uint8_t i_seq[2];
+ uint8_t i_addr4[IEEE80211_ADDR_LEN];
-} __packed;
-+} __attribute__ ((packed));
++} __attribute__((__packed__));
struct ieee80211_qosframe_addr4 {
-@@ -105,7 +105,7 @@
- u_int8_t i_seq[2];
- u_int8_t i_addr4[IEEE80211_ADDR_LEN];
- u_int8_t i_qos[2];
+@@ -99,7 +99,7 @@
+ uint8_t i_seq[2];
+ uint8_t i_addr4[IEEE80211_ADDR_LEN];
+ uint8_t i_qos[2];
-} __packed;
-+} __attribute__ ((packed));
++} __attribute__((__packed__));
#define IEEE80211_FC0_VERSION_MASK 0x03
#define IEEE80211_FC0_VERSION_SHIFT 0
-@@ -194,7 +194,7 @@
- u_int8_t wme_subtype; /* OUI subtype */
- u_int8_t wme_version; /* spec revision */
- u_int8_t wme_info; /* QoS info */
+@@ -205,7 +205,7 @@
+ uint8_t wme_subtype; /* OUI subtype */
+ uint8_t wme_version; /* spec revision */
+ uint8_t wme_info; /* QoS info */
-} __packed;
-+} __attribute__ ((packed));
++} __attribute__((__packed__));
/*
* WME/802.11e Tspec Element
-@@ -222,7 +222,7 @@
- u_int8_t ts_delay[4];
- u_int8_t ts_surplus[2];
- u_int8_t ts_medium_time[2];
+@@ -233,7 +233,7 @@
+ uint8_t ts_delay[4];
+ uint8_t ts_surplus[2];
+ uint8_t ts_medium_time[2];
-} __packed;
-+} __attribute__ ((packed));
++} __attribute__((__packed__));
/*
* WME AC parameter field
-@@ -231,7 +231,7 @@
- u_int8_t acp_aci_aifsn;
- u_int8_t acp_logcwminmax;
- u_int16_t acp_txop;
+@@ -242,7 +242,7 @@
+ uint8_t acp_aci_aifsn;
+ uint8_t acp_logcwminmax;
+ uint16_t acp_txop;
-} __packed;
-+} __attribute__ ((packed));
++} __attribute__((__packed__));
#define WME_NUM_AC 4 /* 4 AC categories */
-
-@@ -272,7 +272,7 @@
+ #define WME_NUM_TID 16 /* 16 tids */
+@@ -284,7 +284,7 @@
#define WME_QOSINFO_COUNT 0x0f /* Mask for param count field */
- u_int8_t param_reserved;
+ uint8_t param_reserved;
struct ieee80211_wme_acparams params_acParams[WME_NUM_AC];
-} __packed;
-+} __attribute__ ((packed));
++} __attribute__((__packed__));
/*
* Management Notification Frame
-@@ -282,7 +282,7 @@
- u_int8_t mnf_action;
- u_int8_t mnf_dialog;
- u_int8_t mnf_status;
+@@ -294,7 +294,7 @@
+ uint8_t mnf_action;
+ uint8_t mnf_dialog;
+ uint8_t mnf_status;
-} __packed;
-+} __attribute__ ((packed));
++} __attribute__((__packed__));
#define MNF_SETUP_REQ 0
#define MNF_SETUP_RESP 1
#define MNF_TEARDOWN 2
-@@ -296,7 +296,7 @@
- u_int8_t i_addr1[IEEE80211_ADDR_LEN];
- u_int8_t i_addr2[IEEE80211_ADDR_LEN];
+@@ -306,7 +306,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 @@
+ struct ieee80211_action_ht_txchwidth {
+ struct ieee80211_action at_header;
+ uint8_t at_chwidth;
+-} __packed;
++} __attribute__((__packed__));
+
+ #define IEEE80211_A_HT_TXCHWIDTH_20 0
+ #define IEEE80211_A_HT_TXCHWIDTH_2040 1
+@@ -328,7 +328,7 @@
+ struct ieee80211_action_ht_mimopowersave {
+ struct ieee80211_action am_header;
+ uint8_t am_control;
+-} __packed;
++} __attribute__((__packed__));
+
+ #define IEEE80211_A_HT_MIMOPWRSAVE_ENA 0x01 /* PS enabled */
+ #define IEEE80211_A_HT_MIMOPWRSAVE_MODE 0x02
+@@ -372,7 +372,7 @@
+ uint16_t rq_baparamset;
+ uint16_t rq_batimeout; /* in TUs */
+ uint16_t rq_baseqctl;
+-} __packed;
++} __attribute__((__packed__));
+
+ /* BA - ADDBA response */
+ struct ieee80211_action_ba_addbaresponse {
+@@ -381,14 +381,14 @@
+ uint16_t rs_statuscode;
+ uint16_t rs_baparamset;
+ uint16_t rs_batimeout; /* in TUs */
+-} __packed;
++} __attribute__((__packed__));
+
+ /* BA - DELBA */
+ struct ieee80211_action_ba_delba {
+ struct ieee80211_action dl_header;
+ uint16_t dl_baparamset;
+ uint16_t dl_reasoncode;
+-} __packed;
++} __attribute__((__packed__));
+
+ /* BAR Control */
+ #define IEEE80211_BAR_TID 0xf000 /* TID */
+@@ -400,7 +400,7 @@
+ struct ieee80211_ba_request {
+ uint16_t rq_barctl;
+ uint16_t rq_barseqctl;
+-} __packed;
++} __attribute__((__packed__));
+
+ /*
+ * Control frames.
+@@ -411,7 +411,7 @@
+ uint8_t i_addr1[IEEE80211_ADDR_LEN];
+ uint8_t i_addr2[IEEE80211_ADDR_LEN];
/* FCS */
-} __packed;
-+} __attribute__ ((packed));
++} __attribute__((__packed__));
struct ieee80211_frame_rts {
- u_int8_t i_fc[2];
-@@ -304,21 +304,21 @@
- u_int8_t i_ra[IEEE80211_ADDR_LEN];
- u_int8_t i_ta[IEEE80211_ADDR_LEN];
+ uint8_t i_fc[2];
+@@ -419,21 +419,21 @@
+ uint8_t i_ra[IEEE80211_ADDR_LEN];
+ uint8_t i_ta[IEEE80211_ADDR_LEN];
/* FCS */
-} __packed;
-+} __attribute__ ((packed));
++} __attribute__((__packed__));
struct ieee80211_frame_cts {
- u_int8_t i_fc[2];
- u_int8_t i_dur[2];
- u_int8_t i_ra[IEEE80211_ADDR_LEN];
+ uint8_t i_fc[2];
+ uint8_t i_dur[2];
+ uint8_t i_ra[IEEE80211_ADDR_LEN];
/* FCS */
-} __packed;
-+} __attribute__ ((packed));
++} __attribute__((__packed__));
struct ieee80211_frame_ack {
- u_int8_t i_fc[2];
- u_int8_t i_dur[2];
- u_int8_t i_ra[IEEE80211_ADDR_LEN];
+ uint8_t i_fc[2];
+ uint8_t i_dur[2];
+ uint8_t i_ra[IEEE80211_ADDR_LEN];
/* FCS */
-} __packed;
-+} __attribute__ ((packed));
++} __attribute__((__packed__));
struct ieee80211_frame_pspoll {
- u_int8_t i_fc[2];
-@@ -326,7 +326,7 @@
- u_int8_t i_bssid[IEEE80211_ADDR_LEN];
- u_int8_t i_ta[IEEE80211_ADDR_LEN];
+ uint8_t i_fc[2];
+@@ -441,7 +441,7 @@
+ uint8_t i_bssid[IEEE80211_ADDR_LEN];
+ uint8_t i_ta[IEEE80211_ADDR_LEN];
/* FCS */
-} __packed;
-+} __attribute__ ((packed));
++} __attribute__((__packed__));
struct ieee80211_frame_cfend { /* NB: also CF-End+CF-Ack */
- u_int8_t i_fc[2];
-@@ -334,7 +334,7 @@
- u_int8_t i_ra[IEEE80211_ADDR_LEN];
- u_int8_t i_bssid[IEEE80211_ADDR_LEN];
+ uint8_t i_fc[2];
+@@ -449,7 +449,7 @@
+ uint8_t i_ra[IEEE80211_ADDR_LEN];
+ uint8_t i_bssid[IEEE80211_ADDR_LEN];
/* FCS */
-} __packed;
-+} __attribute__ ((packed));
++} __attribute__((__packed__));
+ struct ieee80211_frame_bar {
+ uint8_t i_fc[2];
+@@ -459,7 +459,7 @@
+ uint16_t i_ctl;
+ uint16_t i_seq;
+ /* FCS */
+-} __packed;
++} __attribute__((__packed__));
+
/*
* BEACON management packets
-@@ -387,7 +387,7 @@
- u_int16_t wpa_caps; /* 802.11i capabilities */
- u_int16_t wpa_pmkidcnt; /* 802.11i pmkid count */
- u_int16_t wpa_pmkids[8]; /* 802.11i pmkids */
+@@ -511,7 +511,7 @@
+ uint16_t wpa_caps; /* 802.11i capabilities */
+ uint16_t wpa_pmkidcnt; /* 802.11i pmkid count */
+ uint16_t wpa_pmkids[8]; /* 802.11i pmkids */
-} __packed;
-+} __attribute__ ((packed));
++} __attribute__((__packed__));
/*
- * Management information element payloads.
-@@ -419,7 +419,7 @@
- u_int8_t tim_period; /* DTIM period */
- u_int8_t tim_bitctl; /* bitmap control */
- u_int8_t tim_bitmap[1]; /* variable-length bitmap */
+ * 802.11n HT Capability IE
+@@ -526,7 +526,7 @@
+ uint16_t hc_extcap; /* extended HT capabilities */
+ uint32_t hc_txbf; /* txbf capabilities */
+ uint8_t hc_antenna; /* antenna capabilities */
-} __packed;
-+} __attribute__ ((packed));
++} __attribute__((__packed__));
+ /* HT capability flags (ht_cap) */
+ #define IEEE80211_HTCAP_LDPC 0x0001 /* LDPC supported */
+@@ -601,7 +601,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 */
+-} __packed;
++} __attribute__((__packed__));
+
+ /* byte1 */
+ #define IEEE80211_HTINFO_2NDCHAN 0x03 /* secondary/ext chan offset */
+@@ -687,7 +687,7 @@
+ uint8_t tim_period; /* DTIM period */
+ uint8_t tim_bitctl; /* bitmap control */
+ uint8_t tim_bitmap[1]; /* variable-length bitmap */
+-} __packed;
++} __attribute__((__packed__));
+
struct ieee80211_country_ie {
- u_int8_t ie; /* IEEE80211_ELEMID_COUNTRY */
-@@ -429,8 +429,8 @@
- u_int8_t schan; /* starting channel */
- u_int8_t nchan; /* number channels */
- u_int8_t maxtxpwr; /* tx power cap */
-- } band[4] __packed; /* up to 4 sub bands */
+ uint8_t ie; /* IEEE80211_ELEMID_COUNTRY */
+@@ -697,8 +697,8 @@
+ uint8_t schan; /* starting channel */
+ uint8_t nchan; /* number channels */
+ uint8_t maxtxpwr; /* tx power cap */
+- } __packed band[10]; /* sub bands */
-} __packed;
-+ } band[4] __attribute__ ((packed)); /* up to 4 sub bands */
-+} __attribute__ ((packed));
++ } __attribute__((__packed__)) band[10]; /* sub bands */
++} __attribute__((__packed__));
- #define IEEE80211_CHALLENGE_LEN 128
-
---- sys/sys/ata.h.ORIG 2006-11-13 14:13:49.000000000 +0100
-+++ sys/sys/ata.h 2006-11-13 14:15:39.000000000 +0100
-@@ -157,7 +157,7 @@
- #define ATA_SUPPORT_FLUSHCACHE48 0x2000
+ /*
+ * 802.11h Channel Switch Announcement (CSA).
+@@ -709,7 +709,7 @@
+ uint8_t csa_mode; /* Channel Switch Mode */
+ uint8_t csa_newchan; /* New Channel Number */
+ uint8_t csa_count; /* Channel Switch Count */
+-} __packed;
++} __attribute__((__packed__));
- /*084/087*/ u_int16_t extension;
+ /*
+ * 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: sys/sys/ata.h
+===================================================================
+--- sys/sys/ata.h.orig
++++ sys/sys/ata.h
+@@ -167,7 +167,7 @@
+ #define ATA_SUPPORT_WRITEDMAFUAEXT 0x0040
+ #define ATA_SUPPORT_WRITEDMAQFUAEXT 0x0080
+ #define ATA_SUPPORT_64BITWWN 0x0100
- } __packed support, enabled;
+ } __attribute__((__packed__)) support, enabled;
/*088*/ u_int16_t udmamodes; /* UltraDMA modes */
/*089*/ u_int16_t erase_time;
-@@ -188,7 +188,7 @@
+@@ -198,7 +198,7 @@
/*176*/ u_int16_t media_serial[30];
u_int16_t reserved206[49];
/*255*/ u_int16_t integrity;
@@ -191,7 +302,7 @@
/* ATA transfer modes */
-@@ -389,7 +389,7 @@
+@@ -400,7 +400,7 @@
u_int8_t specific1; /* sense key specific */
u_int8_t specific2; /* sense key specific */
@@ -200,9 +311,11 @@
struct ata_ioc_request {
union {
---- sys/dev/ata/atapi-cd.h~ 2006-11-13 14:31:42.000000000 +0100
-+++ sys/dev/ata/atapi-cd.h 2006-11-13 14:31:42.000000000 +0100
-@@ -266,7 +266,7 @@
+Index: sys/dev/ata/atapi-cd.h
+===================================================================
+--- sys/dev/ata/atapi-cd.h.orig
++++ sys/dev/ata/atapi-cd.h
+@@ -267,7 +267,7 @@
u_int8_t vendor_specific_byte1;
u_int8_t vendor_specific_byte2;
u_int8_t vendor_specific_byte3;
@@ -211,3 +324,61 @@
/* CDROM Read Track Information structure */
struct acd_track_info {
+Index: sys/i386/include/segments.h
+===================================================================
+--- sys/amd64/include/segments.h.orig
++++ sys/amd64/include/segments.h
+@@ -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)*/
+ u_int64_t sd_hibase:8; /* segment base address (msb) */
+-} __packed;
++} __attribute__((__packed__));
+
+ /*
+ * System segment descriptors (128 bit wide)
+@@ -86,11 +86,11 @@
+ u_int64_t sd_hilimit:4; /* segment extent (msb) */
+ u_int64_t sd_xx0:3; /* unused */
+ u_int64_t sd_gran:1; /* limit granularity (byte/page units)*/
+- u_int64_t sd_hibase:40 __packed;/* segment base address (msb) */
++ u_int64_t sd_hibase:40 __attribute__((__packed__));/* segment base address (msb) */
+ u_int64_t sd_xx1:8;
+ u_int64_t sd_mbz:5; /* MUST be zero */
+ u_int64_t sd_xx2:19;
+-} __packed;
++} __attribute__((__packed__));
+
+ /*
+ * Gate descriptors (e.g. indirect descriptors, trap, interrupt etc. 128 bit)
+@@ -104,9 +104,9 @@
+ u_int64_t gd_type:5; /* segment type */
+ u_int64_t gd_dpl:2; /* segment descriptor priority level */
+ u_int64_t gd_p:1; /* segment descriptor present */
+- u_int64_t gd_hioffset:48 __packed; /* gate offset (msb) */
++ u_int64_t gd_hioffset:48 __attribute__((__packed__)); /* gate offset (msb) */
+ u_int64_t sd_xx1:32;
+-} __packed;
++} __attribute__((__packed__));
+
+ /* system segments and gate types */
+ #define SDT_SYSNULL 0 /* system null */
+@@ -150,15 +150,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)*/
+-} __packed;
++} __attribute__((__packed__));
+
+ /*
+ * region descriptors, used to load gdt/idt tables before segments yet exist.
+ */
+ struct region_descriptor {
+ unsigned long rd_limit:16; /* segment extent */
+- unsigned long rd_base:64 __packed; /* base address */
+-} __packed;
++ unsigned long rd_base:64 __attribute__((__packed__)); /* base address */
++} __attribute__((__packed__));
+
+ /*
+ * Size of IDT table
Modified: trunk/kfreebsd-kernel-headers/debian/patches/029_conf.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/029_conf.diff 2008-06-22 03:27:36 UTC (rev 2186)
+++ trunk/kfreebsd-kernel-headers/debian/patches/029_conf.diff 2008-06-23 15:50:54 UTC (rev 2187)
@@ -1,5 +1,7 @@
---- sys/sys/conf.h~ 2006-12-04 09:29:27.000000000 +0100
-+++ sys/sys/conf.h 2006-12-04 09:29:27.000000000 +0100
+Index: sys/sys/conf.h
+===================================================================
+--- sys/sys/conf.h.orig
++++ sys/sys/conf.h
@@ -43,6 +43,7 @@
#ifdef _KERNEL
#include <sys/eventhandler.h>
@@ -8,7 +10,7 @@
#include <sys/queue.h>
#endif
-@@ -255,11 +255,11 @@
+@@ -263,17 +264,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,
@@ -17,6 +19,13 @@
struct cdev *make_dev_cred(struct cdevsw *_devsw, int _minor,
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 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, ...);
Modified: trunk/kfreebsd-kernel-headers/debian/patches/030_pfvar.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/030_pfvar.diff 2008-06-22 03:27:36 UTC (rev 2186)
+++ trunk/kfreebsd-kernel-headers/debian/patches/030_pfvar.diff 2008-06-23 15:50:54 UTC (rev 2187)
@@ -1,8 +1,10 @@
---- sys/contrib/pf/net/pfvar.h 2007-01-11 16:26:28.000000000 +0100
-+++ sys/contrib/pf/net/pfvar.h 2007-01-11 16:26:28.000000000 +0100
-@@ -39,14 +39,17 @@
- #include <sys/queue.h>
- #include <sys/tree.h>
+Index: sys/contrib/pf/net/pfvar.h
+===================================================================
+--- sys/contrib/pf/net/pfvar.h.orig
++++ sys/contrib/pf/net/pfvar.h
+@@ -45,8 +45,10 @@
+ #include <sys/rwlock.h>
+ #endif
+#include <net/if.h>
#include <net/radix.h>
@@ -10,7 +12,8 @@
+#ifdef _KERNEL
#ifdef __FreeBSD_kernel__
#include <net/if_clone.h>
- #include <vm/uma.h>
+ #include <net/pf_mtag.h>
+@@ -54,6 +56,7 @@
#else
#endif
Modified: trunk/kfreebsd-kernel-headers/debian/patches/031_ufs.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/031_ufs.diff 2008-06-22 03:27:36 UTC (rev 2186)
+++ trunk/kfreebsd-kernel-headers/debian/patches/031_ufs.diff 2008-06-23 15:50:54 UTC (rev 2187)
@@ -1,9 +1,11 @@
---- sys/ufs/ufs/quota.h~ 2007-12-18 17:50:00.000000000 +0100
-+++ sys/ufs/ufs/quota.h 2007-12-18 17:50:00.000000000 +0100
-@@ -185,7 +185,6 @@
- int quotaon(struct thread *td, struct mount *, int, caddr_t);
- int setquota(struct thread *, struct mount *, u_long, int, caddr_t);
- int setuse(struct thread *, struct mount *, u_long, int, caddr_t);
+Index: sys/ufs/ufs/quota.h
+===================================================================
+--- sys/ufs/ufs/quota.h.orig
++++ sys/ufs/ufs/quota.h
+@@ -205,7 +205,6 @@
+ int quotaon(struct thread *td, struct mount *, int, void *);
+ int setquota(struct thread *, struct mount *, u_long, int, void *);
+ int setuse(struct thread *, struct mount *, u_long, int, void *);
-vfs_quotactl_t ufs_quotactl;
#else /* !_KERNEL */
Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules 2008-06-22 03:27:36 UTC (rev 2186)
+++ trunk/kfreebsd-kernel-headers/debian/rules 2008-06-23 15:50:54 UTC (rev 2187)
@@ -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-6.3.tar.bz2
-SRC_DIR := kfreebsd-source-6.3
+SRC_TAR := /usr/src/kfreebsd-source-7.0.tar.bz2
+SRC_DIR := kfreebsd-source-7.0
clean:
dh_testdir
More information about the Glibc-bsd-commits
mailing list