[Glibc-bsd-commits] r3410 - trunk/kfreebsd-kernel-headers/debian/patches
Guillem Jover
guillem at alioth.debian.org
Tue Jun 7 04:53:48 UTC 2011
Author: guillem
Date: 2011-06-07 04:53:48 +0000 (Tue, 07 Jun 2011)
New Revision: 3410
Modified:
trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
trunk/kfreebsd-kernel-headers/debian/patches/001_sys_soundcard.diff
trunk/kfreebsd-kernel-headers/debian/patches/002_gdb.diff
trunk/kfreebsd-kernel-headers/debian/patches/003_osreldate.diff
trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff
trunk/kfreebsd-kernel-headers/debian/patches/006_sys_tty_h.diff
trunk/kfreebsd-kernel-headers/debian/patches/007_kvm.diff
trunk/kfreebsd-kernel-headers/debian/patches/008_vm_vm_param_h.diff
trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff
trunk/kfreebsd-kernel-headers/debian/patches/010_glibc.diff
trunk/kfreebsd-kernel-headers/debian/patches/011_wine.diff
trunk/kfreebsd-kernel-headers/debian/patches/012_strace.diff
trunk/kfreebsd-kernel-headers/debian/patches/013_mips.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/018_sys__types.diff
trunk/kfreebsd-kernel-headers/debian/patches/019_exec_pagesize.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/022_sys_buf_h.diff
trunk/kfreebsd-kernel-headers/debian/patches/023_packed.diff
trunk/kfreebsd-kernel-headers/debian/patches/024_ioccom.diff
trunk/kfreebsd-kernel-headers/debian/patches/025_iconv.diff
trunk/kfreebsd-kernel-headers/debian/patches/026_acpiio.diff
trunk/kfreebsd-kernel-headers/debian/patches/027_ktrace.diff
trunk/kfreebsd-kernel-headers/debian/patches/028_fbio.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/patches/032_vnode.diff
trunk/kfreebsd-kernel-headers/debian/patches/033_pcpu.diff
trunk/kfreebsd-kernel-headers/debian/patches/034_usb.diff
trunk/kfreebsd-kernel-headers/debian/patches/035_devfs_int.diff
trunk/kfreebsd-kernel-headers/debian/patches/036_tcpvar.diff
trunk/kfreebsd-kernel-headers/debian/patches/037_ciss.diff
trunk/kfreebsd-kernel-headers/debian/patches/038_gnuclike.diff
Log:
Refresh all patches
Modified: trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff 2011-06-07 04:26:34 UTC (rev 3409)
+++ trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff 2011-06-07 04:53:48 UTC (rev 3410)
@@ -1,7 +1,34 @@
-Index: kfreebsd-source-8.0/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
+---
+ sys/amd64/include/pcb.h | 1
+ sys/i386/include/npx.h | 2
+ sys/i386/include/pcb.h | 2
+ sys/i386/include/pmap.h | 7 ++
+ sys/net/if_arp.h | 14 +++++
+ sys/net/if_dl.h | 14 ++---
+ sys/nfsclient/nfs.h | 5 ++
+ sys/sys/callout.h | 2
+ sys/sys/dvdio.h | 2
+ sys/sys/extattr.h | 52 ++++++++++-----------
+ sys/sys/filedesc.h | 1
+ sys/sys/jail.h | 16 ++++--
+ sys/sys/linker.h | 22 +++++----
+ sys/sys/lock.h | 1
+ sys/sys/memrange.h | 7 ++
+ sys/sys/pciio.h | 2
+ sys/sys/procfs.h | 4 +
+ sys/sys/resourcevar.h | 2
+ sys/sys/rtprio.h | 12 +++-
+ sys/sys/signalvar.h | 10 +++-
+ sys/sys/sysctl.h | 116 +++++++++++++++++++++++++++++++++++++++++++++---
+ sys/sys/timepps.h | 2
+ sys/sys/timex.h | 21 +++++---
+ sys/sys/ucred.h | 3 +
+ sys/vm/vm.h | 2
+ sys/vm/vm_map.h | 6 ++
+ 26 files changed, 262 insertions(+), 66 deletions(-)
+
+--- a/sys/i386/include/npx.h
++++ b/sys/i386/include/npx.h
@@ -41,6 +41,8 @@
#ifndef _MACHINE_NPX_H_
#define _MACHINE_NPX_H_
@@ -11,10 +38,8 @@
/* Environment information of floating point unit */
struct env87 {
long en_cw; /* control word (16bits) */
-Index: kfreebsd-source-8.0/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
+--- a/sys/amd64/include/pcb.h
++++ b/sys/amd64/include/pcb.h
@@ -40,6 +40,7 @@
/*
* AMD64 process control block
@@ -23,10 +48,8 @@
#include <machine/fpu.h>
#include <machine/segments.h>
-Index: kfreebsd-source-8.0/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
+--- a/sys/i386/include/pcb.h
++++ b/sys/i386/include/pcb.h
@@ -36,6 +36,8 @@
#ifndef _I386_PCB_H_
#define _I386_PCB_H_
@@ -36,10 +59,8 @@
/*
* Intel 386 process control block
*/
-Index: kfreebsd-source-8.0/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
+--- a/sys/i386/include/pmap.h
++++ b/sys/i386/include/pmap.h
@@ -44,6 +44,13 @@
#ifndef _MACHINE_PMAP_H_
#define _MACHINE_PMAP_H_
@@ -54,10 +75,8 @@
/*
* 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: kfreebsd-source-8.0/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
+--- a/sys/net/if_arp.h
++++ b/sys/net/if_arp.h
@@ -33,6 +33,11 @@
#ifndef _NET_IF_ARP_H_
#define _NET_IF_ARP_H_
@@ -70,12 +89,10 @@
/*
* Address Resolution Protocol.
*
-@@ -81,6 +86,15 @@
- (sizeof(struct arphdr) + 2*(ar_hln) + 2*(ar_pln))
- #define arphdr_len(ap) (arphdr_len2((ap)->ar_hln, (ap)->ar_pln))
+@@ -74,6 +79,15 @@ struct arphdr {
-+#define ar_sha(ap) (((caddr_t)((ap)+1)) + 0)
-+#define ar_spa(ap) (((caddr_t)((ap)+1)) + (ap)->ar_hln)
+ #define ar_sha(ap) (((caddr_t)((ap)+1)) + 0)
+ #define ar_spa(ap) (((caddr_t)((ap)+1)) + (ap)->ar_hln)
+#define ar_tha(ap) (((caddr_t)((ap)+1)) + (ap)->ar_hln + (ap)->ar_pln)
+#define ar_tpa(ap) (((caddr_t)((ap)+1)) + 2*(ap)->ar_hln + (ap)->ar_pln)
+
@@ -83,13 +100,13 @@
+ (sizeof(struct arphdr) + 2*(ar_hln) + 2*(ar_pln))
+#define arphdr_len(ap) (arphdr_len2((ap)->ar_hln, (ap)->ar_pln))
+
- /*
- * ARP ioctl request
- */
-Index: kfreebsd-source-8.0/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
++#define ar_sha(ap) (((caddr_t)((ap)+1)) + 0)
++#define ar_spa(ap) (((caddr_t)((ap)+1)) + (ap)->ar_hln)
+ #define ar_tha(ap) (((caddr_t)((ap)+1)) + (ap)->ar_hln + (ap)->ar_pln)
+ #define ar_tpa(ap) (((caddr_t)((ap)+1)) + 2*(ap)->ar_hln + (ap)->ar_pln)
+
+--- a/sys/net/if_dl.h
++++ b/sys/net/if_dl.h
@@ -33,6 +33,10 @@
#ifndef _NET_IF_DL_H_
#define _NET_IF_DL_H_
@@ -101,7 +118,7 @@
/*
* A Link-Level Sockaddr may specify the interface in one of two
* ways: either by means of a system-provided index number (computed
-@@ -68,15 +72,9 @@
+@@ -68,15 +72,9 @@ struct sockaddr_dl {
#define LLADDR(s) ((caddr_t)((s)->sdl_data + (s)->sdl_nlen))
@@ -119,10 +136,8 @@
-#endif /* !_KERNEL */
-
#endif
-Index: kfreebsd-source-8.0/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
+--- a/sys/nfsclient/nfs.h
++++ b/sys/nfsclient/nfs.h
@@ -36,6 +36,11 @@
#ifndef _NFSCLIENT_NFS_H_
#define _NFSCLIENT_NFS_H_
@@ -135,10 +150,8 @@
#ifdef _KERNEL
#include "opt_nfs.h"
#endif
-Index: kfreebsd-source-8.0/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
+--- a/sys/sys/callout.h
++++ b/sys/sys/callout.h
@@ -38,6 +38,8 @@
#ifndef _SYS_CALLOUT_H_
#define _SYS_CALLOUT_H_
@@ -148,10 +161,8 @@
#include <sys/queue.h>
struct lock_object;
-Index: kfreebsd-source-8.0/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
+--- a/sys/sys/dvdio.h
++++ b/sys/sys/dvdio.h
@@ -31,6 +31,8 @@
#ifndef _SYS_DVDIO_H_
#define _SYS_DVDIO_H_
@@ -161,11 +172,9 @@
struct dvd_layer {
u_int8_t book_type :4;
u_int8_t book_version :4;
-Index: kfreebsd-source-8.0/sys/sys/extattr.h
-===================================================================
---- 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 @@
+--- a/sys/sys/extattr.h
++++ b/sys/sys/extattr.h
+@@ -68,36 +68,36 @@ int extattr_check_cred(struct vnode *vp,
struct ucred *cred, struct thread *td, accmode_t accmode);
#else
@@ -228,10 +237,8 @@
__END_DECLS
#endif /* !_KERNEL */
-Index: kfreebsd-source-8.0/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
+--- a/sys/sys/filedesc.h
++++ b/sys/sys/filedesc.h
@@ -33,6 +33,7 @@
#ifndef _SYS_FILEDESC_H_
#define _SYS_FILEDESC_H_
@@ -240,11 +247,9 @@
#include <sys/queue.h>
#include <sys/event.h>
#include <sys/lock.h>
-Index: kfreebsd-source-8.0/sys/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 @@
+--- a/sys/sys/jail.h
++++ b/sys/sys/jail.h
+@@ -39,6 +39,10 @@ struct jail_v0 {
};
#endif
@@ -255,7 +260,7 @@
struct jail {
uint32_t version;
char *path;
-@@ -108,11 +112,13 @@
+@@ -108,11 +112,13 @@ struct xprison {
struct iovec;
@@ -274,11 +279,9 @@
#else /* _KERNEL */
-Index: kfreebsd-source-8.0/sys/sys/linker.h
-===================================================================
---- 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 @@
+--- a/sys/sys/linker.h
++++ b/sys/sys/linker.h
+@@ -189,6 +189,13 @@ int linker_search_symbol_name(caddr_t va
/* HWPMC helper */
void *linker_hwpmc_list_objects(void);
@@ -292,7 +295,7 @@
#endif /* _KERNEL */
/*
-@@ -332,14 +339,13 @@
+@@ -332,14 +339,13 @@ struct kld_sym_lookup {
#include <sys/cdefs.h>
__BEGIN_DECLS
@@ -314,10 +317,8 @@
__END_DECLS
#endif
-Index: kfreebsd-source-8.0/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
+--- a/sys/sys/lock.h
++++ b/sys/sys/lock.h
@@ -32,6 +32,7 @@
#ifndef _SYS_LOCK_H_
#define _SYS_LOCK_H_
@@ -326,12 +327,10 @@
#include <sys/queue.h>
#include <sys/_lock.h>
-Index: kfreebsd-source-8.0/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
+--- a/sys/sys/memrange.h
++++ b/sys/sys/memrange.h
@@ -4,6 +4,11 @@
- * $FreeBSD: src/sys/sys/memrange.h,v 1.8.2.1.2.1 2009/10/25 01:10:29 kensmith Exp $
+ * $FreeBSD$
*/
+#ifndef _SYS_MEMRANGE_H_
@@ -342,16 +341,14 @@
/* Memory range attributes */
#define MDF_UNCACHEABLE (1<<0) /* region not cached */
#define MDF_WRITECOMBINE (1<<1) /* region supports "write combine" action */
-@@ -69,3 +74,5 @@
+@@ -69,3 +74,5 @@ extern int mem_range_attr_get(struct mem
extern int mem_range_attr_set(struct mem_range_desc *mrd, int *arg);
#endif
+
+#endif /* _SYS_MEMRANGE_H_ */
-Index: kfreebsd-source-8.0/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
+--- a/sys/sys/pciio.h
++++ b/sys/sys/pciio.h
@@ -31,6 +31,8 @@
#ifndef _SYS_PCIIO_H_
#define _SYS_PCIIO_H_
@@ -361,11 +358,9 @@
#include <sys/ioccom.h>
#define PCI_MAXNAMELEN 16
-Index: kfreebsd-source-8.0/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 @@
+--- a/sys/sys/procfs.h
++++ b/sys/sys/procfs.h
+@@ -82,4 +82,8 @@ typedef struct prpsinfo {
typedef uint64_t psaddr_t; /* An address in the target process. */
@@ -374,10 +369,8 @@
+typedef __pid_t lwpid_t;
+
#endif /* _SYS_PROCFS_H_ */
-Index: kfreebsd-source-8.0/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
+--- a/sys/sys/resourcevar.h
++++ b/sys/sys/resourcevar.h
@@ -35,6 +35,8 @@
#include <sys/resource.h>
@@ -387,10 +380,8 @@
#ifdef _KERNEL
#include <sys/_lock.h>
#include <sys/_mutex.h>
-Index: kfreebsd-source-8.0/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
+--- a/sys/sys/rtprio.h
++++ b/sys/sys/rtprio.h
@@ -36,6 +36,10 @@
#include <sys/priority.h>
@@ -410,7 +401,7 @@
/*
* Scheduling class information.
*/
-@@ -79,14 +82,15 @@
+@@ -79,14 +82,15 @@ struct thread;
int rtp_to_pri(struct rtprio *, struct thread *);
void pri_to_rtp(struct thread *, struct rtprio *);
#endif
@@ -429,10 +420,8 @@
__END_DECLS
#endif /* !_KERNEL */
#endif /* !_SYS_RTPRIO_H_ */
-Index: kfreebsd-source-8.0/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
+--- a/sys/sys/signalvar.h
++++ b/sys/sys/signalvar.h
@@ -43,6 +43,9 @@
* not exported to user programs.
*/
@@ -443,15 +432,15 @@
/*
* Logical process signal actions and state, needed only within the process
* The mapping between sigacts and proc structures is 1:1 except for rfork()
-@@ -95,6 +98,7 @@
+@@ -95,6 +98,7 @@ struct osigaction {
typedef void __osiginfohandler_t(int, osiginfo_t *, void *);
#endif /* _KERNEL && COMPAT_43 */
+#if 0
/* additional signal action values, used only temporarily/internally */
#define SIG_CATCH ((__sighandler_t *)2)
- #define SIG_HOLD ((__sighandler_t *)3)
-@@ -181,7 +188,7 @@
+ /* #define SIG_HOLD ((__sighandler_t *)3) See signal.h */
+@@ -181,7 +185,7 @@ __sigisempty(sigset_t *set)
int i;
for (i = 0; i < _SIG_WORDS; i++) {
@@ -460,7 +449,7 @@
return (0);
}
return (1);
-@@ -193,7 +200,7 @@
+@@ -193,7 +197,7 @@ __sigseteq(sigset_t *set1, sigset_t *set
int i;
for (i = 0; i < _SIG_WORDS; i++) {
@@ -469,7 +458,7 @@
return (0);
}
return (1);
-@@ -208,6 +215,8 @@
+@@ -208,6 +212,8 @@ struct osigevent {
union sigval sigev_value; /* Signal value */
};
@@ -478,10 +467,8 @@
typedef struct ksiginfo {
TAILQ_ENTRY(ksiginfo) ksi_link;
siginfo_t ksi_info;
-Index: kfreebsd-source-8.0/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
+--- a/sys/sys/sysctl.h
++++ b/sys/sys/sysctl.h
@@ -36,7 +36,103 @@
#ifndef _SYS_SYSCTL_H_
#define _SYS_SYSCTL_H_
@@ -587,7 +574,7 @@
struct thread;
/*
-@@ -387,7 +483,7 @@
+@@ -387,7 +483,7 @@ TAILQ_HEAD(sysctl_ctx_list, sysctl_ctx_e
#define KERN_SECURELVL 9 /* int: system security level */
#define KERN_HOSTNAME 10 /* string: hostname */
#define KERN_HOSTID 11 /* int: host identifier */
@@ -596,7 +583,7 @@
#define KERN_VNODE 13 /* struct: vnode structures */
#define KERN_PROC 14 /* struct: process entries */
#define KERN_FILE 15 /* struct: file entries */
-@@ -711,13 +807,21 @@
+@@ -712,13 +808,21 @@ void sysctl_unlock(void);
int sysctl_wire_old_buffer(struct sysctl_req *req, size_t len);
#else /* !_KERNEL */
@@ -622,10 +609,8 @@
#endif /* _KERNEL */
#endif /* !_SYS_SYSCTL_H_ */
-Index: kfreebsd-source-8.0/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
+--- a/sys/sys/timepps.h
++++ b/sys/sys/timepps.h
@@ -15,6 +15,8 @@
#ifndef _SYS_TIMEPPS_H_
#define _SYS_TIMEPPS_H_
@@ -635,10 +620,8 @@
#include <sys/ioccom.h>
#include <sys/time.h>
-Index: kfreebsd-source-8.0/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
+--- a/sys/sys/timex.h
++++ b/sys/sys/timex.h
@@ -95,11 +95,9 @@
*/
#ifndef _SYS_TIMEX_H_
@@ -668,7 +651,7 @@
struct timespec time; /* current time (ns) (ro) */
long maxerror; /* maximum error (us) (ro) */
long esterror; /* estimated error (us) (ro) */
-@@ -225,9 +229,12 @@
+@@ -225,9 +229,12 @@ void ntp_update_second(int64_t *adjustme
#else /* !_KERNEL */
#include <sys/cdefs.h>
@@ -683,10 +666,8 @@
__END_DECLS
#endif /* _KERNEL */
-Index: kfreebsd-source-8.0/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
+--- a/sys/sys/ucred.h
++++ b/sys/sys/ucred.h
@@ -33,6 +33,9 @@
#ifndef _SYS_UCRED_H_
#define _SYS_UCRED_H_
@@ -697,23 +678,19 @@
#include <bsm/audit.h>
/*
-Index: kfreebsd-source-8.0/sys/vm/vm.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 */
+--- a/sys/vm/vm.h
++++ b/sys/vm/vm.h
+@@ -63,6 +63,8 @@
+ #include <machine/vm.h>
+
+#include <sys/_types.h>
+
typedef char vm_inherit_t; /* inheritance codes */
#define VM_INHERIT_SHARE ((vm_inherit_t) 0)
-Index: kfreebsd-source-8.0/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
+--- a/sys/vm/vm_map.h
++++ b/sys/vm/vm_map.h
@@ -70,6 +70,12 @@
#include <sys/sx.h>
#include <sys/_mutex.h>
Modified: trunk/kfreebsd-kernel-headers/debian/patches/001_sys_soundcard.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/001_sys_soundcard.diff 2011-06-07 04:26:34 UTC (rev 3409)
+++ trunk/kfreebsd-kernel-headers/debian/patches/001_sys_soundcard.diff 2011-06-07 04:53:48 UTC (rev 3410)
@@ -1,6 +1,10 @@
---- src/sys/sys/soundcard.h.orig 2005-04-28 22:29:18.000000000 +0200
-+++ src/sys/sys/soundcard.h 2005-08-03 15:26:34.000000000 +0200
-@@ -94,6 +94,10 @@
+---
+ sys/sys/soundcard.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/sys/sys/soundcard.h
++++ b/sys/sys/soundcard.h
+@@ -102,6 +102,10 @@
#define SNDCARD_UART16550 27
#define SNDCARD_OPL 28
Modified: trunk/kfreebsd-kernel-headers/debian/patches/002_gdb.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/002_gdb.diff 2011-06-07 04:26:34 UTC (rev 3409)
+++ trunk/kfreebsd-kernel-headers/debian/patches/002_gdb.diff 2011-06-07 04:53:48 UTC (rev 3410)
@@ -1,13 +1,15 @@
-diff -ur sys.orig/sys/event.h sys/sys/event.h
---- src/sys.orig/sys/event.h 2004-11-30 01:05:19.000000000 +0100
-+++ src/sys/sys/event.h 2004-11-30 01:06:55.000000000 +0100
-@@ -29,6 +29,8 @@
- #ifndef _SYS_EVENT_H_
- #define _SYS_EVENT_H_
+---
+ sys/sys/event.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/sys/sys/event.h
++++ b/sys/sys/event.h
+@@ -31,6 +31,8 @@
+ #include <sys/queue.h>
+
+#include <stdint.h>
+
#define EVFILT_READ (-1)
#define EVFILT_WRITE (-2)
#define EVFILT_AIO (-3) /* attached to aio requests */
-
Modified: trunk/kfreebsd-kernel-headers/debian/patches/003_osreldate.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/003_osreldate.diff 2011-06-07 04:26:34 UTC (rev 3409)
+++ trunk/kfreebsd-kernel-headers/debian/patches/003_osreldate.diff 2011-06-07 04:53:48 UTC (rev 3410)
@@ -1,6 +1,9 @@
-diff -Nur sys/osreldate.h sys/osreldate.h
---- src/sys/osreldate.h
-+++ src/sys/osreldate.h
+---
+ sys/osreldate.h | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+--- /dev/null
++++ b/sys/osreldate.h
@@ -0,0 +1,15 @@
+
+/* kFreeBSD 8.0 headers */
Modified: trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff 2011-06-07 04:26:34 UTC (rev 3409)
+++ trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff 2011-06-07 04:53:48 UTC (rev 3410)
@@ -1,5 +1,14 @@
---- src/sys/net80211/_ieee80211.h
-+++ src/sys/net80211/_ieee80211.h
+---
+ sys/amd64/include/apm_bios.h | 1 +
+ sys/dev/usb/usb_endian.h | 2 +-
+ sys/i386/include/apm_bios.h | 1 +
+ sys/net/if_media.h | 2 ++
+ sys/net80211/_ieee80211.h | 2 ++
+ sys/net80211/ieee80211.h | 2 ++
+ 6 files changed, 9 insertions(+), 1 deletion(-)
+
+--- a/sys/net80211/_ieee80211.h
++++ b/sys/net80211/_ieee80211.h
@@ -28,6 +28,8 @@
#ifndef _NET80211__IEEE80211_H_
#define _NET80211__IEEE80211_H_
@@ -9,8 +18,8 @@
/*
* 802.11 implementation definitions.
*
---- src/sys/net80211/ieee80211.h
-+++ src/sys/net80211/ieee80211.h
+--- a/sys/net80211/ieee80211.h
++++ b/sys/net80211/ieee80211.h
@@ -28,6 +28,8 @@
#ifndef _NET80211_IEEE80211_H_
#define _NET80211_IEEE80211_H_
@@ -20,8 +29,8 @@
/*
* 802.11 protocol definitions.
*/
---- src/sys/net/if_media.h
-+++ src/sys/net/if_media.h
+--- a/sys/net/if_media.h
++++ b/sys/net/if_media.h
@@ -38,6 +38,8 @@
#ifndef _NET_IF_MEDIA_H_
#define _NET_IF_MEDIA_H_
@@ -31,8 +40,8 @@
/*
* Prototypes and definitions for BSD/OS-compatible network interface
* media selection.
---- src/sys/dev/usb/usb_endian.h~
-+++ src/sys/dev/usb/usb_endian.h
+--- a/sys/dev/usb/usb_endian.h
++++ b/sys/dev/usb/usb_endian.h
@@ -27,7 +27,7 @@
#ifndef _USB_ENDIAN_H_
#define _USB_ENDIAN_H_
Modified: trunk/kfreebsd-kernel-headers/debian/patches/006_sys_tty_h.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/006_sys_tty_h.diff 2011-06-07 04:26:34 UTC (rev 3409)
+++ trunk/kfreebsd-kernel-headers/debian/patches/006_sys_tty_h.diff 2011-06-07 04:53:48 UTC (rev 3410)
@@ -1,7 +1,9 @@
-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
+---
+ sys/sys/tty.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/sys/sys/tty.h
++++ b/sys/sys/tty.h
@@ -34,6 +34,8 @@
#include <sys/param.h>
Modified: trunk/kfreebsd-kernel-headers/debian/patches/007_kvm.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/007_kvm.diff 2011-06-07 04:26:34 UTC (rev 3409)
+++ trunk/kfreebsd-kernel-headers/debian/patches/007_kvm.diff 2011-06-07 04:53:48 UTC (rev 3410)
@@ -1,10 +1,13 @@
FIXME: should migrate to uintXX_t / <stdint.h>
-diff -ur sys.orig/sys/blist.h sys/sys/blist.h
---- src/sys.orig/sys/blist.h 2004-06-04 06:03:25.000000000 +0200
-+++ src/sys/sys/blist.h 2004-11-30 01:15:18.000000000 +0100
-@@ -53,6 +53,8 @@
+---
+ sys/sys/blist.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/sys/sys/blist.h
++++ b/sys/sys/blist.h
+@@ -56,6 +56,8 @@
#ifndef _SYS_BLIST_H_
#define _SYS_BLIST_H_
Modified: trunk/kfreebsd-kernel-headers/debian/patches/008_vm_vm_param_h.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/008_vm_vm_param_h.diff 2011-06-07 04:26:34 UTC (rev 3409)
+++ trunk/kfreebsd-kernel-headers/debian/patches/008_vm_vm_param_h.diff 2011-06-07 04:53:48 UTC (rev 3410)
@@ -1,5 +1,10 @@
---- src/sys/vm.old/vm_param.h 2005-09-04 12:22:36.000000000 -0400
-+++ src/sys/vm/vm_param.h 2005-09-04 14:13:45.000000000 -0400
+---
+ sys/vm/swap_pager.h | 3 +++
+ sys/vm/vm_param.h | 3 ++-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+--- a/sys/vm/vm_param.h
++++ b/sys/vm/vm_param.h
@@ -67,6 +67,7 @@
#ifndef _VM_PARAM_
#define _VM_PARAM_
@@ -17,8 +22,8 @@
dev_t xsw_dev;
int xsw_flags;
int xsw_nblks;
---- src/sys/vm/swap_pager.h
-+++ src/sys/vm/swap_pager.h
+--- a/sys/vm/swap_pager.h
++++ b/sys/vm/swap_pager.h
@@ -38,6 +38,9 @@
#ifndef _VM_SWAP_PAGER_H_
#define _VM_SWAP_PAGER_H_ 1
Modified: trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff 2011-06-07 04:26:34 UTC (rev 3409)
+++ trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff 2011-06-07 04:53:48 UTC (rev 3410)
@@ -1,7 +1,15 @@
-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-14 13:21:07.000000000 +0000
+---
+ sys/net/if_dl.h | 14 +++++++-------
+ sys/net/if_var.h | 20 +++++++++++++++++---
+ sys/net/route.h | 2 ++
+ sys/netinet/in_var.h | 2 ++
+ sys/netinet/ip_var.h | 2 ++
+ sys/netinet6/in6_var.h | 3 +++
+ sys/sys/fnv_hash.h | 4 +++-
+ 7 files changed, 36 insertions(+), 11 deletions(-)
+
+--- a/sys/net/route.h
++++ b/sys/net/route.h
@@ -33,6 +33,8 @@
#ifndef _NET_ROUTE_H_
#define _NET_ROUTE_H_
@@ -11,10 +19,8 @@
/*
* Kernel resident routing tables.
*
-Index: kfreebsd-source-8.0/sys/net/if_dl.h
-===================================================================
---- kfreebsd-source-8.0.orig/sys/net/if_dl.h 2009-11-14 13:21:07.000000000 +0000
-+++ kfreebsd-source-8.0/sys/net/if_dl.h 2009-11-14 13:21:07.000000000 +0000
+--- a/sys/net/if_dl.h
++++ b/sys/net/if_dl.h
@@ -59,13 +59,13 @@
* Structure of a Link-Level sockaddr:
*/
@@ -36,10 +42,8 @@
char sdl_data[46]; /* minimum work area, can be larger;
contains both if name and ll address */
};
-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-14 13:28:30.000000000 +0000
+--- a/sys/net/if_var.h
++++ b/sys/net/if_var.h
@@ -33,6 +33,9 @@
#ifndef _NET_IF_VAR_H_
#define _NET_IF_VAR_H_
@@ -50,7 +54,7 @@
/*
* Structures defining a network interface, providing a packet
* transport mechanism (ala level 0 of the PUP protocols).
-@@ -84,7 +87,7 @@
+@@ -84,7 +87,7 @@ struct vnet;
#endif /* _KERNEL */
#include <sys/lock.h> /* XXX */
#include <sys/mutex.h> /* XXX */
@@ -59,7 +63,7 @@
#include <sys/sx.h> /* XXX */
#include <sys/event.h> /* XXX */
#include <sys/_task.h>
-@@ -696,8 +699,19 @@
+@@ -710,8 +713,19 @@ drbr_inuse(struct ifnet *ifp, struct buf
*/
struct ifaddr {
struct sockaddr *ifa_addr; /* address of interface */
@@ -81,10 +85,8 @@
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 */
-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-14 13:21:07.000000000 +0000
+--- a/sys/netinet/in_var.h
++++ b/sys/netinet/in_var.h
@@ -34,7 +34,9 @@
#define _NETINET_IN_VAR_H_
@@ -95,10 +97,8 @@
#include <sys/tree.h>
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-14 13:21:07.000000000 +0000
+--- a/sys/netinet/ip_var.h
++++ b/sys/netinet/ip_var.h
@@ -34,6 +34,8 @@
#define _NETINET_IP_VAR_H_
@@ -108,10 +108,8 @@
/*
* Overlay for ip header used by other protocols (tcp, udp).
-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-14 13:21:07.000000000 +0000
+--- a/sys/netinet6/in6_var.h
++++ b/sys/netinet6/in6_var.h
@@ -70,6 +70,9 @@
#include <sys/libkern.h>
#endif
@@ -122,12 +120,10 @@
/*
* Interface address, Internet version. One of these structures
* is allocated for each interface with an Internet address.
-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-14 13:21:07.000000000 +0000
+--- a/sys/sys/fnv_hash.h
++++ b/sys/sys/fnv_hash.h
@@ -8,6 +8,8 @@
- * $FreeBSD: src/sys/sys/fnv_hash.h,v 1.3.22.1.2.1 2009/10/25 01:10:29 kensmith Exp $
+ * $FreeBSD$
*/
+#include <sys/types.h>
@@ -135,7 +131,7 @@
typedef u_int32_t Fnv32_t;
typedef u_int64_t Fnv64_t;
-@@ -58,7 +60,7 @@
+@@ -58,7 +60,7 @@ static __inline Fnv64_t
fnv_64_str(const char *str, Fnv64_t hval)
{
const u_int8_t *s = (const u_int8_t *)str;
Modified: trunk/kfreebsd-kernel-headers/debian/patches/010_glibc.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/010_glibc.diff 2011-06-07 04:26:34 UTC (rev 3409)
+++ trunk/kfreebsd-kernel-headers/debian/patches/010_glibc.diff 2011-06-07 04:53:48 UTC (rev 3410)
@@ -1,6 +1,9 @@
-diff -ur sys.orig/sys/syslimits.h sys/sys/syslimits.h
---- src/sys.orig/sys/syslimits.h 2004-11-30 01:05:19.000000000 +0100
-+++ src/sys/sys/syslimits.h 2004-11-30 01:23:49.000000000 +0100
+---
+ sys/sys/syslimits.h | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+--- a/sys/sys/syslimits.h
++++ b/sys/sys/syslimits.h
@@ -33,15 +33,6 @@
#ifndef _SYS_SYSLIMITS_H_
#define _SYS_SYSLIMITS_H_
Modified: trunk/kfreebsd-kernel-headers/debian/patches/011_wine.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/011_wine.diff 2011-06-07 04:26:34 UTC (rev 3409)
+++ trunk/kfreebsd-kernel-headers/debian/patches/011_wine.diff 2011-06-07 04:53:48 UTC (rev 3410)
@@ -1,7 +1,12 @@
-Index: kfreebsd-source-8.0/sys/i386/include/segments.h
-===================================================================
---- 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
+---
+ sys/i386/include/segments.h | 4
+ sys/sys/elf32.h | 202 --------------------------------------------
+ sys/sys/elf64.h | 198 -------------------------------------------
+ sys/sys/elf_common.h | 8 +
+ 4 files changed, 13 insertions(+), 399 deletions(-)
+
+--- a/sys/i386/include/segments.h
++++ b/sys/i386/include/segments.h
@@ -64,7 +64,7 @@
*/
struct segment_descriptor {
@@ -11,7 +16,7 @@
unsigned sd_type:5 ; /* segment type */
unsigned sd_dpl:2 ; /* segment descriptor priority level */
unsigned sd_p:1 ; /* segment descriptor present */
-@@ -156,7 +156,7 @@
+@@ -156,7 +156,7 @@ struct soft_segment_descriptor {
*/
struct region_descriptor {
unsigned rd_limit:16; /* segment extent */
@@ -20,10 +25,8 @@
};
/*
-Index: kfreebsd-source-8.0/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
+--- a/sys/sys/elf32.h
++++ b/sys/sys/elf32.h
@@ -35,11 +35,9 @@
* ELF definitions common to all 32-bit architectures.
*/
@@ -39,7 +42,7 @@
typedef uint64_t Elf32_Lword;
typedef Elf32_Word Elf32_Hashelt;
-@@ -48,198 +46,4 @@
+@@ -48,198 +46,4 @@ typedef Elf32_Word Elf32_Hashelt;
typedef Elf32_Word Elf32_Size;
typedef Elf32_Sword Elf32_Ssize;
@@ -238,10 +241,8 @@
-} Elf32_Syminfo;
-
#endif /* !_SYS_ELF32_H_ */
-Index: kfreebsd-source-8.0/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
+--- a/sys/sys/elf64.h
++++ b/sys/sys/elf64.h
@@ -35,14 +35,10 @@
* ELF definitions common to all 64-bit architectures.
*/
@@ -260,7 +261,7 @@
/*
* Types of dynamic symbol hash table bucket and chain elements.
-@@ -57,192 +53,4 @@
+@@ -57,192 +53,4 @@ typedef Elf64_Word Elf64_Hashelt;
typedef Elf64_Xword Elf64_Size;
typedef Elf64_Sxword Elf64_Ssize;
@@ -453,10 +454,8 @@
-} Elf64_Syminfo;
-
#endif /* !_SYS_ELF64_H_ */
-Index: kfreebsd-source-8.0/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
+--- a/sys/sys/elf_common.h
++++ b/sys/sys/elf_common.h
@@ -29,6 +29,8 @@
#ifndef _SYS_ELF_COMMON_H_
#define _SYS_ELF_COMMON_H_ 1
Modified: trunk/kfreebsd-kernel-headers/debian/patches/012_strace.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/012_strace.diff 2011-06-07 04:26:34 UTC (rev 3409)
+++ trunk/kfreebsd-kernel-headers/debian/patches/012_strace.diff 2011-06-07 04:53:48 UTC (rev 3410)
@@ -1,6 +1,11 @@
---- src/sys/i386/include/npx.h~ 2004-12-01 18:13:36.000000000 +0100
-+++ src/sys/i386/include/npx.h 2004-12-01 18:17:24.000000000 +0100
-@@ -111,7 +111,7 @@
+---
+ sys/amd64/include/fpu.h | 2 +-
+ sys/i386/include/npx.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/sys/i386/include/npx.h
++++ b/sys/i386/include/npx.h
+@@ -111,7 +111,7 @@ struct savexmm {
} sv_fp[8];
struct xmmacc sv_xmm[8];
u_char sv_pad[224];
@@ -9,14 +14,14 @@
union savefpu {
struct save87 sv_87;
---- src/sys/amd64/include/fpu.h~ 2006-03-01 20:30:51.000000000 +0100
-+++ src/sys/amd64/include/fpu.h 2006-03-29 20:27:45.000000000 +0200
-@@ -71,7 +71,7 @@
+--- a/sys/amd64/include/fpu.h
++++ b/sys/amd64/include/fpu.h
+@@ -71,7 +71,7 @@ struct savefpu {
} sv_fp[8];
struct xmmacc sv_xmm[16];
u_char sv_pad[96];
-} __aligned(16);
+} __attribute__((aligned(16)));
- /*
- * The hardware default control word for i387's and later coprocessors is
+ #ifdef _KERNEL
+ struct fpu_kern_ctx {
Modified: trunk/kfreebsd-kernel-headers/debian/patches/013_mips.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/013_mips.diff 2011-06-07 04:26:34 UTC (rev 3409)
+++ trunk/kfreebsd-kernel-headers/debian/patches/013_mips.diff 2011-06-07 04:53:48 UTC (rev 3410)
@@ -1,3 +1,8 @@
+---
+ sys/mips/include/frame.h | 2 ++
+ sys/mips/include/reg.h | 2 ++
+ 2 files changed, 4 insertions(+)
+
--- a/sys/mips/include/frame.h
+++ b/sys/mips/include/frame.h
@@ -37,6 +37,8 @@
Modified: trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff 2011-06-07 04:26:34 UTC (rev 3409)
+++ trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff 2011-06-07 04:53:48 UTC (rev 3410)
@@ -1,6 +1,12 @@
+---
+ sys/dev/usb/usb.h | 46 ++++++++++++++++++++++-----------------------
+ sys/i386/include/cpufunc.h | 12 +----------
+ sys/sys/_types.h | 14 ++++---------
+ 3 files changed, 30 insertions(+), 42 deletions(-)
+
--- a/sys/dev/usb/usb.h
+++ b/sys/dev/usb/usb.h
-@@ -146,7 +146,7 @@
+@@ -146,7 +146,7 @@ struct usb_device_request {
uWord wValue;
uWord wIndex;
uWord wLength;
@@ -9,7 +15,7 @@
typedef struct usb_device_request usb_device_request_t;
#define UT_WRITE 0x00
-@@ -270,7 +270,7 @@
+@@ -270,7 +270,7 @@ struct usb_descriptor {
uByte bLength;
uByte bDescriptorType;
uByte bDescriptorSubtype;
@@ -18,7 +24,7 @@
typedef struct usb_descriptor usb_descriptor_t;
struct usb_device_descriptor {
-@@ -293,7 +293,7 @@
+@@ -293,7 +293,7 @@ struct usb_device_descriptor {
uByte iProduct;
uByte iSerialNumber;
uByte bNumConfigurations;
@@ -27,7 +33,7 @@
typedef struct usb_device_descriptor usb_device_descriptor_t;
/* Binary Device Object Store (BOS) */
-@@ -302,7 +302,7 @@
+@@ -302,7 +302,7 @@ struct usb_bos_descriptor {
uByte bDescriptorType;
uWord wTotalLength;
uByte bNumDeviceCaps;
@@ -36,7 +42,7 @@
typedef struct usb_bos_descriptor usb_bos_descriptor_t;
/* Binary Device Object Store Capability */
-@@ -316,7 +316,7 @@
+@@ -316,7 +316,7 @@ struct usb_bos_cap_descriptor {
#define USB_DEVCAP_SUPER_SPEED 0x03
#define USB_DEVCAP_CONTAINER_ID 0x04
/* data ... */
@@ -45,7 +51,7 @@
typedef struct usb_bos_cap_descriptor usb_bos_cap_descriptor_t;
struct usb_devcap_usb2ext_descriptor {
-@@ -325,7 +325,7 @@
+@@ -325,7 +325,7 @@ struct usb_devcap_usb2ext_descriptor {
uByte bDevCapabilityType;
uByte bmAttributes;
#define USB_V2EXT_LPM 0x02
@@ -54,7 +60,7 @@
typedef struct usb_devcap_usb2ext_descriptor usb_devcap_usb2ext_descriptor_t;
struct usb_devcap_ss_descriptor {
-@@ -337,7 +337,7 @@
+@@ -337,7 +337,7 @@ struct usb_devcap_ss_descriptor {
uByte bFunctionalitySupport;
uByte bU1DevExitLat;
uByte bU2DevExitLat;
@@ -63,7 +69,7 @@
typedef struct usb_devcap_ss_descriptor usb_devcap_ss_descriptor_t;
struct usb_devcap_container_id_descriptor {
-@@ -346,7 +346,7 @@
+@@ -346,7 +346,7 @@ struct usb_devcap_container_id_descripto
uByte bDevCapabilityType;
uByte bReserved;
uByte bContainerID;
@@ -72,7 +78,7 @@
typedef struct usb_devcap_container_id_descriptor
usb_devcap_container_id_descriptor_t;
-@@ -379,7 +379,7 @@
+@@ -379,7 +379,7 @@ struct usb_config_descriptor {
#define UC_REMOTE_WAKEUP 0x20
uByte bMaxPower; /* max current in 2 mA units */
#define UC_POWER_FACTOR 2
@@ -81,7 +87,7 @@
typedef struct usb_config_descriptor usb_config_descriptor_t;
struct usb_interface_descriptor {
-@@ -392,7 +392,7 @@
+@@ -392,7 +392,7 @@ struct usb_interface_descriptor {
uByte bInterfaceSubClass;
uByte bInterfaceProtocol;
uByte iInterface;
@@ -90,7 +96,7 @@
typedef struct usb_interface_descriptor usb_interface_descriptor_t;
struct usb_interface_assoc_descriptor {
-@@ -404,7 +404,7 @@
+@@ -404,7 +404,7 @@ struct usb_interface_assoc_descriptor {
uByte bFunctionSubClass;
uByte bFunctionProtocol;
uByte iFunction;
@@ -99,7 +105,7 @@
typedef struct usb_interface_assoc_descriptor usb_interface_assoc_descriptor_t;
/* Interface class codes */
-@@ -530,7 +530,7 @@
+@@ -530,7 +530,7 @@ struct usb_endpoint_descriptor {
uWord wMaxPacketSize;
#define UE_ZERO_MPS 0xFFFF /* for internal use only */
uByte bInterval;
@@ -108,7 +114,7 @@
typedef struct usb_endpoint_descriptor usb_endpoint_descriptor_t;
struct usb_endpoint_ss_comp_descriptor {
-@@ -539,7 +539,7 @@
+@@ -539,7 +539,7 @@ struct usb_endpoint_ss_comp_descriptor {
uByte bMaxBurst;
uByte bmAttributes;
uWord wBytesPerInterval;
@@ -117,7 +123,7 @@
typedef struct usb_endpoint_ss_comp_descriptor
usb_endpoint_ss_comp_descriptor_t;
-@@ -548,7 +548,7 @@
+@@ -548,7 +548,7 @@ struct usb_string_descriptor {
uByte bDescriptorType;
uWord bString[126];
uByte bUnused;
@@ -126,7 +132,7 @@
typedef struct usb_string_descriptor usb_string_descriptor_t;
#define USB_MAKE_STRING_DESC(m,name) \
-@@ -556,7 +556,7 @@
+@@ -556,7 +556,7 @@ struct name { \
uByte bLength; \
uByte bDescriptorType; \
uByte bData[sizeof((uint8_t []){m})]; \
@@ -135,7 +141,7 @@
static const struct name name = { \
.bLength = sizeof(struct name), \
.bDescriptorType = UDESC_STRING, \
-@@ -590,7 +590,7 @@
+@@ -590,7 +590,7 @@ struct usb_hub_descriptor {
#define UHD_NOT_REMOV(desc, i) \
(((desc)->DeviceRemovable[(i)/8] >> ((i) % 8)) & 1)
uByte PortPowerCtrlMask[1]; /* deprecated */
@@ -144,7 +150,7 @@
typedef struct usb_hub_descriptor usb_hub_descriptor_t;
struct usb_hub_ss_descriptor {
-@@ -603,7 +603,7 @@
+@@ -603,7 +603,7 @@ struct usb_hub_ss_descriptor {
uByte bHubHdrDecLat;
uWord wHubDelay;
uByte DeviceRemovable[32]; /* max 255 ports */
@@ -153,7 +159,7 @@
typedef struct usb_hub_ss_descriptor usb_hub_ss_descriptor_t;
/* minimum HUB descriptor (8-ports maximum) */
-@@ -616,7 +616,7 @@
+@@ -616,7 +616,7 @@ struct usb_hub_descriptor_min {
uByte bHubContrCurrent;
uByte DeviceRemovable[1];
uByte PortPowerCtrlMask[1];
@@ -162,7 +168,7 @@
typedef struct usb_hub_descriptor_min usb_hub_descriptor_min_t;
struct usb_device_qualifier {
-@@ -629,7 +629,7 @@
+@@ -629,7 +629,7 @@ struct usb_device_qualifier {
uByte bMaxPacketSize0;
uByte bNumConfigurations;
uByte bReserved;
@@ -171,7 +177,7 @@
typedef struct usb_device_qualifier usb_device_qualifier_t;
struct usb_otg_descriptor {
-@@ -638,7 +638,7 @@
+@@ -638,7 +638,7 @@ struct usb_otg_descriptor {
uByte bmAttributes;
#define UOTG_SRP 0x01
#define UOTG_HNP 0x02
@@ -180,7 +186,7 @@
typedef struct usb_otg_descriptor usb_otg_descriptor_t;
/* OTG feature selectors */
-@@ -653,7 +653,7 @@
+@@ -653,7 +653,7 @@ struct usb_status {
#define UDS_REMOTE_WAKEUP 0x0002
/* Endpoint status flags */
#define UES_HALT 0x0001
@@ -189,7 +195,7 @@
typedef struct usb_status usb_status_t;
struct usb_hub_status {
-@@ -661,7 +661,7 @@
+@@ -661,7 +661,7 @@ struct usb_hub_status {
#define UHS_LOCAL_POWER 0x0001
#define UHS_OVER_CURRENT 0x0002
uWord wHubChange;
@@ -198,7 +204,7 @@
typedef struct usb_hub_status usb_hub_status_t;
struct usb_port_status {
-@@ -702,7 +702,7 @@
+@@ -702,7 +702,7 @@ struct usb_port_status {
#define UPS_C_BH_PORT_RESET 0x0020
#define UPS_C_PORT_LINK_STATE 0x0040
#define UPS_C_PORT_CONFIG_ERROR 0x0080
@@ -218,7 +224,7 @@
#ifndef _SYS_CDEFS_H_
#error this file needs sys/cdefs.h as a prerequisite
#endif
-@@ -683,16 +685,11 @@
+@@ -683,16 +685,11 @@ void enable_intr(void);
void halt(void);
void ia32_pause(void);
u_char inb(u_int port);
@@ -235,7 +241,7 @@
void lidt(struct region_descriptor *addr);
void lldt(u_short sel);
void load_cr0(u_int cr0);
-@@ -710,11 +707,6 @@
+@@ -710,11 +707,6 @@ void load_fs(u_int sel);
void load_gs(u_int sel);
void ltr(u_short sel);
void outb(u_int port, u_char data);
@@ -257,7 +263,7 @@
/*
* Standard type definitions.
-@@ -39,10 +40,14 @@
+@@ -39,10 +40,14 @@ typedef __uint32_t __blksize_t; /* file
typedef __int64_t __blkcnt_t; /* file block count */
typedef __int32_t __clockid_t; /* clock_gettime()... */
typedef __uint32_t __fflags_t; /* file flags */
@@ -272,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) */
-@@ -93,13 +98,4 @@
+@@ -93,13 +98,4 @@ typedef __uint32_t __dev_t; /* device nu
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 2011-06-07 04:26:34 UTC (rev 3409)
+++ trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff 2011-06-07 04:53:48 UTC (rev 3410)
@@ -1,19 +1,26 @@
-Index: kfreebsd-source-8.0/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
+---
+ sys/amd64/include/md_var.h | 2 ++
+ sys/cam/scsi/scsi_all.h | 1 +
+ sys/i386/include/md_var.h | 2 ++
+ sys/sys/_mutex.h | 2 ++
+ sys/sys/_timeval.h | 9 +--------
+ sys/sys/bio.h | 9 +++++++++
+ sys/sys/devicestat.h | 3 +++
+ sys/sys/timespec.h | 5 +----
+ 8 files changed, 21 insertions(+), 12 deletions(-)
+
+--- a/sys/cam/scsi/scsi_all.h
++++ b/sys/cam/scsi/scsi_all.h
@@ -25,6 +25,7 @@
- #define _SCSI_SCSI_ALL_H 1
+ #define _SCSI_SCSI_ALL_H 1
#include <sys/cdefs.h>
+#include <stdint.h>
#ifdef _KERNEL
/*
-Index: kfreebsd-source-8.0/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
+--- a/sys/i386/include/md_var.h
++++ b/sys/i386/include/md_var.h
@@ -32,6 +32,8 @@
#ifndef _MACHINE_MD_VAR_H_
#define _MACHINE_MD_VAR_H_
@@ -23,10 +30,8 @@
/*
* Miscellaneous machine-dependent declarations.
*/
-Index: kfreebsd-source-8.0/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
+--- a/sys/amd64/include/md_var.h
++++ b/sys/amd64/include/md_var.h
@@ -32,6 +32,8 @@
#ifndef _MACHINE_MD_VAR_H_
#define _MACHINE_MD_VAR_H_
@@ -36,10 +41,8 @@
/*
* Miscellaneous machine-dependent declarations.
*/
-Index: kfreebsd-source-8.0/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
+--- a/sys/sys/_mutex.h
++++ b/sys/sys/_mutex.h
@@ -31,6 +31,8 @@
#ifndef _SYS__MUTEX_H_
#define _SYS__MUTEX_H_
@@ -49,10 +52,8 @@
/*
* Sleep/spin mutex.
*/
-Index: kfreebsd-source-8.0/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
+--- a/sys/sys/_timeval.h
++++ b/sys/sys/_timeval.h
@@ -30,6 +30,7 @@
#define _SYS__TIMEVAL_H_
@@ -61,7 +62,7 @@
#ifndef _SUSECONDS_T_DECLARED
typedef __suseconds_t suseconds_t;
-@@ -41,12 +42,4 @@
+@@ -41,12 +42,4 @@ typedef __time_t time_t;
#define _TIME_T_DECLARED
#endif
@@ -74,10 +75,8 @@
-};
-
#endif /* !_SYS__TIMEVAL_H_ */
-Index: kfreebsd-source-8.0/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
+--- a/sys/sys/bio.h
++++ b/sys/sys/bio.h
@@ -39,6 +39,15 @@
#define _SYS_BIO_H_
@@ -92,12 +91,10 @@
+};
+#endif
- struct disk;
- struct bio;
-Index: kfreebsd-source-8.0/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
+ /* bio_cmd */
+ #define BIO_READ 0x01
+--- a/sys/sys/devicestat.h
++++ b/sys/sys/devicestat.h
@@ -33,6 +33,9 @@
#include <sys/queue.h>
@@ -108,11 +105,9 @@
/*
* XXX: Should really be SPECNAMELEN
-Index: kfreebsd-source-8.0/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 @@
+--- a/sys/sys/timespec.h
++++ b/sys/sys/timespec.h
+@@ -43,10 +43,7 @@ typedef __time_t time_t;
#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 2011-06-07 04:26:34 UTC (rev 3409)
+++ trunk/kfreebsd-kernel-headers/debian/patches/018_sys__types.diff 2011-06-07 04:53:48 UTC (rev 3410)
@@ -1,6 +1,11 @@
---- src/sys/sys/_types.h.orig 2005-10-11 01:30:09.000000000 +0200
-+++ src/sys/sys/_types.h 2005-12-13 20:13:11.000000000 +0100
-@@ -62,7 +62,6 @@
+---
+ sys/sys/_types.h | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ sys/sys/proc.h | 1
+ 2 files changed, 59 insertions(+), 1 deletion(-)
+
+--- a/sys/sys/_types.h
++++ b/sys/sys/_types.h
+@@ -63,7 +63,6 @@ typedef __int64_t __rlim_t; /* resource
typedef __uint8_t __sa_family_t;
typedef __uint32_t __socklen_t;
typedef long __suseconds_t; /* microseconds (signed) */
@@ -8,7 +13,7 @@
typedef struct __mq *__mqd_t; /* mq_open()... */
typedef __uint32_t __uid_t;
typedef unsigned int __useconds_t; /* microseconds (unsigned) */
-@@ -82,4 +82,62 @@
+@@ -98,4 +97,62 @@ typedef __uint32_t __dev_t; /* device nu
typedef __uint32_t __fixpt_t; /* fixed point number */
@@ -71,8 +76,8 @@
+#endif
+
#endif /* !_SYS__TYPES_H_ */
---- src/sys/sys/proc.h.orig 2005-10-11 01:30:09.000000000 +0200
-+++ src/sys/sys/proc.h 2005-12-13 20:09:19.000000000 +0100
+--- a/sys/sys/proc.h
++++ b/sys/sys/proc.h
@@ -38,6 +38,7 @@
#ifndef _SYS_PROC_H_
#define _SYS_PROC_H_
@@ -80,4 +85,4 @@
+#include <sys/_types.h>
#include <sys/callout.h> /* For struct callout. */
#include <sys/event.h> /* For struct klist. */
- #ifndef _KERNEL
+ #include <sys/condvar.h>
Modified: trunk/kfreebsd-kernel-headers/debian/patches/019_exec_pagesize.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/019_exec_pagesize.diff 2011-06-07 04:26:34 UTC (rev 3409)
+++ trunk/kfreebsd-kernel-headers/debian/patches/019_exec_pagesize.diff 2011-06-07 04:53:48 UTC (rev 3410)
@@ -1,7 +1,12 @@
---- src/sys/amd64/include/param.h 2005-11-19 18:53:09.000000000 +0100
-+++ src/sys/amd64/include/param.h 2006-01-16 13:14:18.000000000 +0100
-@@ -71,6 +71,10 @@
- #define _MACHINE_ARCH amd64
+---
+ sys/amd64/include/param.h | 4 ++++
+ sys/i386/include/param.h | 4 ++++
+ 2 files changed, 8 insertions(+)
+
+--- a/sys/amd64/include/param.h
++++ b/sys/amd64/include/param.h
+@@ -55,6 +55,10 @@
+ #define _ALIGN(p) (((u_long)(p) + _ALIGNBYTES) &~ _ALIGNBYTES)
#endif
+#ifndef EXEC_PAGESIZE
@@ -10,11 +15,11 @@
+
#ifndef _NO_NAMESPACE_POLLUTION
- #ifndef _MACHINE_PARAM_H_
---- src/sys/i386/include/param.h 2005-11-19 19:23:51.000000000 +0100
-+++ src/sys/i386/include/param.h 2006-01-16 13:16:22.000000000 +0100
-@@ -56,6 +56,10 @@
- #define _MACHINE_ARCH i386
+ #define __HAVE_ACPI
+--- a/sys/i386/include/param.h
++++ b/sys/i386/include/param.h
+@@ -49,6 +49,10 @@
+ #define _ALIGN(p) (((unsigned)(p) + _ALIGNBYTES) & ~_ALIGNBYTES)
#endif
+#ifndef EXEC_PAGESIZE
@@ -23,4 +28,4 @@
+
#ifndef _NO_NAMESPACE_POLLUTION
- #ifndef _MACHINE_PARAM_H_
+ #define __HAVE_ACPI
Modified: trunk/kfreebsd-kernel-headers/debian/patches/020_concat_elf_generic.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/020_concat_elf_generic.diff 2011-06-07 04:26:34 UTC (rev 3409)
+++ trunk/kfreebsd-kernel-headers/debian/patches/020_concat_elf_generic.diff 2011-06-07 04:53:48 UTC (rev 3410)
@@ -1,7 +1,9 @@
-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
+---
+ sys/sys/elf_generic.h | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+--- a/sys/sys/elf_generic.h
++++ b/sys/sys/elf_generic.h
@@ -50,9 +50,10 @@
#error "Unknown byte order"
#endif
Modified: trunk/kfreebsd-kernel-headers/debian/patches/021_machine__types.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/021_machine__types.diff 2011-06-07 04:26:34 UTC (rev 3409)
+++ trunk/kfreebsd-kernel-headers/debian/patches/021_machine__types.diff 2011-06-07 04:53:48 UTC (rev 3410)
@@ -1,7 +1,10 @@
-Index: kfreebsd-source-8.0/sys/i386/include/_types.h
-===================================================================
---- 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
+---
+ sys/amd64/include/_types.h | 11 +++++++++--
+ sys/i386/include/_types.h | 12 +++++++++---
+ 2 files changed, 18 insertions(+), 5 deletions(-)
+
+--- a/sys/i386/include/_types.h
++++ b/sys/i386/include/_types.h
@@ -39,12 +39,15 @@
#ifndef _MACHINE__TYPES_H_
#define _MACHINE__TYPES_H_
@@ -19,7 +22,7 @@
/*
* Basic types upon which most other types are built.
*/
-@@ -69,18 +72,19 @@
+@@ -69,18 +72,19 @@ typedef long long __int64_t;
/* LONGLONG */
typedef unsigned long long __uint64_t;
#endif
@@ -41,7 +44,7 @@
typedef __int32_t __int_fast8_t;
typedef __int32_t __int_fast16_t;
typedef __int32_t __int_fast32_t;
-@@ -92,9 +96,11 @@
+@@ -92,9 +96,11 @@ typedef __int64_t __int_least64_t;
typedef __int32_t __ptrdiff_t; /* ptr1 - ptr2 */
typedef __int32_t __register_t;
typedef __int32_t __segsz_t; /* segment size (in pages) */
@@ -53,10 +56,8 @@
typedef __uint32_t __uintfptr_t;
typedef __uint64_t __uintmax_t;
typedef __uint32_t __uintptr_t;
-Index: kfreebsd-source-8.0/sys/amd64/include/_types.h
-===================================================================
---- 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
+--- a/sys/amd64/include/_types.h
++++ b/sys/amd64/include/_types.h
@@ -39,12 +39,15 @@
#ifndef _MACHINE__TYPES_H_
#define _MACHINE__TYPES_H_
@@ -74,7 +75,7 @@
/*
* Basic types upon which most other types are built.
*/
-@@ -56,16 +59,18 @@
+@@ -56,16 +59,18 @@ typedef int __int32_t;
typedef unsigned int __uint32_t;
typedef long __int64_t;
typedef unsigned long __uint64_t;
@@ -94,7 +95,7 @@
typedef __int64_t __intmax_t;
typedef __int64_t __intptr_t;
typedef __int32_t __int_fast8_t;
-@@ -79,9 +84,11 @@
+@@ -79,9 +84,11 @@ typedef __int64_t __int_least64_t;
typedef __int64_t __ptrdiff_t; /* ptr1 - ptr2 */
typedef __int64_t __register_t;
typedef __int64_t __segsz_t; /* segment size (in pages) */
Modified: trunk/kfreebsd-kernel-headers/debian/patches/022_sys_buf_h.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/022_sys_buf_h.diff 2011-06-07 04:26:34 UTC (rev 3409)
+++ trunk/kfreebsd-kernel-headers/debian/patches/022_sys_buf_h.diff 2011-06-07 04:53:48 UTC (rev 3410)
@@ -1,5 +1,9 @@
---- src/sys/sys/buf.h 2006-08-25 17:45:28.000000000 +0200
-+++ src/sys/sys/buf.h 2006-08-25 16:23:08.000000000 +0200
+---
+ sys/sys/buf.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sys/sys/buf.h
++++ b/sys/sys/buf.h
@@ -38,7 +38,7 @@
#ifndef _SYS_BUF_H_
#define _SYS_BUF_H_
Modified: trunk/kfreebsd-kernel-headers/debian/patches/023_packed.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/023_packed.diff 2011-06-07 04:26:34 UTC (rev 3409)
+++ trunk/kfreebsd-kernel-headers/debian/patches/023_packed.diff 2011-06-07 04:53:48 UTC (rev 3410)
@@ -1,5 +1,12 @@
-Index: b/sys/net80211/ieee80211.h
-===================================================================
+---
+ sys/amd64/include/segments.h | 16 +++++-----
+ sys/dev/ata/atapi-cd.h | 2 -
+ sys/dev/ciss/cissio.h | 28 ++++++++---------
+ sys/net80211/ieee80211.h | 64 ++++++++++++++++++++---------------------
+ sys/net80211/ieee80211_ioctl.h | 2 -
+ sys/sys/ata.h | 6 +--
+ 6 files changed, 59 insertions(+), 59 deletions(-)
+
--- a/sys/net80211/ieee80211.h
+++ b/sys/net80211/ieee80211.h
@@ -1,4 +1,4 @@
@@ -8,7 +15,7 @@
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
-@@ -47,7 +47,7 @@
+@@ -47,7 +47,7 @@ struct ieee80211_plcp_hdr {
uint8_t i_service;
uint16_t i_length;
uint16_t i_crc;
@@ -17,7 +24,7 @@
#define IEEE80211_PLCP_SFD 0xF3A0
#define IEEE80211_PLCP_SERVICE 0x00
-@@ -69,7 +69,7 @@
+@@ -69,7 +69,7 @@ struct ieee80211_frame {
uint8_t i_seq[2];
/* possibly followed by addr4[IEEE80211_ADDR_LEN]; */
/* see below */
@@ -26,7 +33,7 @@
struct ieee80211_qosframe {
uint8_t i_fc[2];
-@@ -81,7 +81,7 @@
+@@ -81,7 +81,7 @@ struct ieee80211_qosframe {
uint8_t i_qos[2];
/* possibly followed by addr4[IEEE80211_ADDR_LEN]; */
/* see below */
@@ -35,7 +42,7 @@
struct ieee80211_qoscntl {
uint8_t i_qos[2];
-@@ -95,7 +95,7 @@
+@@ -95,7 +95,7 @@ struct ieee80211_frame_addr4 {
uint8_t i_addr3[IEEE80211_ADDR_LEN];
uint8_t i_seq[2];
uint8_t i_addr4[IEEE80211_ADDR_LEN];
@@ -44,7 +51,7 @@
struct ieee80211_qosframe_addr4 {
-@@ -107,7 +107,7 @@
+@@ -107,7 +107,7 @@ struct ieee80211_qosframe_addr4 {
uint8_t i_seq[2];
uint8_t i_addr4[IEEE80211_ADDR_LEN];
uint8_t i_qos[2];
@@ -53,7 +60,7 @@
#define IEEE80211_FC0_VERSION_MASK 0x03
#define IEEE80211_FC0_VERSION_SHIFT 0
-@@ -218,7 +218,7 @@
+@@ -218,7 +218,7 @@ struct ieee80211_wme_info {
uint8_t wme_subtype; /* OUI subtype */
uint8_t wme_version; /* spec revision */
uint8_t wme_info; /* QoS info */
@@ -62,7 +69,7 @@
/*
* WME/802.11e Tspec Element
-@@ -246,7 +246,7 @@
+@@ -246,7 +246,7 @@ struct ieee80211_wme_tspec {
uint8_t ts_delay[4];
uint8_t ts_surplus[2];
uint8_t ts_medium_time[2];
@@ -71,7 +78,7 @@
/*
* WME AC parameter field
-@@ -255,7 +255,7 @@
+@@ -255,7 +255,7 @@ struct ieee80211_wme_acparams {
uint8_t acp_aci_aifsn;
uint8_t acp_logcwminmax;
uint16_t acp_txop;
@@ -80,7 +87,7 @@
#define WME_NUM_AC 4 /* 4 AC categories */
#define WME_NUM_TID 16 /* 16 tids */
-@@ -297,7 +297,7 @@
+@@ -297,7 +297,7 @@ struct ieee80211_wme_param {
#define WME_QOSINFO_COUNT 0x0f /* Mask for param count field */
uint8_t param_reserved;
struct ieee80211_wme_acparams params_acParams[WME_NUM_AC];
@@ -89,7 +96,7 @@
/*
* Management Notification Frame
-@@ -307,7 +307,7 @@
+@@ -307,7 +307,7 @@ struct ieee80211_mnf {
uint8_t mnf_action;
uint8_t mnf_dialog;
uint8_t mnf_status;
@@ -98,7 +105,7 @@
#define MNF_SETUP_REQ 0
#define MNF_SETUP_RESP 1
#define MNF_TEARDOWN 2
-@@ -319,7 +319,7 @@
+@@ -319,7 +319,7 @@ struct ieee80211_mnf {
struct ieee80211_action {
uint8_t ia_category;
uint8_t ia_action;
@@ -107,7 +114,7 @@
#define IEEE80211_ACTION_CAT_SM 0 /* Spectrum Management */
#define IEEE80211_ACTION_CAT_QOS 1 /* QoS */
-@@ -335,7 +335,7 @@
+@@ -335,7 +335,7 @@ struct ieee80211_action {
struct ieee80211_action_ht_txchwidth {
struct ieee80211_action at_header;
uint8_t at_chwidth;
@@ -116,7 +123,7 @@
#define IEEE80211_A_HT_TXCHWIDTH_20 0
#define IEEE80211_A_HT_TXCHWIDTH_2040 1
-@@ -344,7 +344,7 @@
+@@ -344,7 +344,7 @@ struct ieee80211_action_ht_txchwidth {
struct ieee80211_action_ht_mimopowersave {
struct ieee80211_action am_header;
uint8_t am_control;
@@ -125,7 +132,7 @@
#define IEEE80211_A_HT_MIMOPWRSAVE_ENA 0x01 /* PS enabled */
#define IEEE80211_A_HT_MIMOPWRSAVE_MODE 0x02
-@@ -388,7 +388,7 @@
+@@ -388,7 +388,7 @@ struct ieee80211_action_ba_addbarequest
uint16_t rq_baparamset;
uint16_t rq_batimeout; /* in TUs */
uint16_t rq_baseqctl;
@@ -134,7 +141,7 @@
/* BA - ADDBA response */
struct ieee80211_action_ba_addbaresponse {
-@@ -397,14 +397,14 @@
+@@ -397,14 +397,14 @@ struct ieee80211_action_ba_addbaresponse
uint16_t rs_statuscode;
uint16_t rs_baparamset;
uint16_t rs_batimeout; /* in TUs */
@@ -151,7 +158,7 @@
/* BAR Control */
#define IEEE80211_BAR_TID 0xf000 /* TID */
-@@ -420,7 +420,7 @@
+@@ -420,7 +420,7 @@ struct ieee80211_action_ba_delba {
struct ieee80211_ba_request {
uint16_t rq_barctl;
uint16_t rq_barseqctl;
@@ -160,7 +167,7 @@
/*
* Control frames.
-@@ -431,7 +431,7 @@
+@@ -431,7 +431,7 @@ struct ieee80211_frame_min {
uint8_t i_addr1[IEEE80211_ADDR_LEN];
uint8_t i_addr2[IEEE80211_ADDR_LEN];
/* FCS */
@@ -169,7 +176,7 @@
struct ieee80211_frame_rts {
uint8_t i_fc[2];
-@@ -439,21 +439,21 @@
+@@ -439,21 +439,21 @@ struct ieee80211_frame_rts {
uint8_t i_ra[IEEE80211_ADDR_LEN];
uint8_t i_ta[IEEE80211_ADDR_LEN];
/* FCS */
@@ -194,7 +201,7 @@
struct ieee80211_frame_pspoll {
uint8_t i_fc[2];
-@@ -461,7 +461,7 @@
+@@ -461,7 +461,7 @@ struct ieee80211_frame_pspoll {
uint8_t i_bssid[IEEE80211_ADDR_LEN];
uint8_t i_ta[IEEE80211_ADDR_LEN];
/* FCS */
@@ -203,7 +210,7 @@
struct ieee80211_frame_cfend { /* NB: also CF-End+CF-Ack */
uint8_t i_fc[2];
-@@ -469,7 +469,7 @@
+@@ -469,7 +469,7 @@ struct ieee80211_frame_cfend { /* NB: a
uint8_t i_ra[IEEE80211_ADDR_LEN];
uint8_t i_bssid[IEEE80211_ADDR_LEN];
/* FCS */
@@ -212,7 +219,7 @@
struct ieee80211_frame_bar {
uint8_t i_fc[2];
-@@ -479,7 +479,7 @@
+@@ -479,7 +479,7 @@ struct ieee80211_frame_bar {
uint16_t i_ctl;
uint16_t i_seq;
/* FCS */
@@ -221,7 +228,7 @@
/*
* BEACON management packets
-@@ -536,7 +536,7 @@
+@@ -536,7 +536,7 @@ struct ieee80211_ie_wpa {
uint16_t wpa_caps; /* 802.11i capabilities */
uint16_t wpa_pmkidcnt; /* 802.11i pmkid count */
uint16_t wpa_pmkids[8]; /* 802.11i pmkids */
@@ -230,7 +237,7 @@
/*
* 802.11n HT Capability IE
-@@ -551,7 +551,7 @@
+@@ -551,7 +551,7 @@ struct ieee80211_ie_htcap {
uint16_t hc_extcap; /* extended HT capabilities */
uint32_t hc_txbf; /* txbf capabilities */
uint8_t hc_antenna; /* antenna capabilities */
@@ -239,7 +246,7 @@
/* HT capability flags (ht_cap) */
#define IEEE80211_HTCAP_LDPC 0x0001 /* LDPC supported */
-@@ -631,7 +631,7 @@
+@@ -631,7 +631,7 @@ struct ieee80211_ie_htinfo {
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 */
@@ -248,7 +255,7 @@
/* byte1 */
#define IEEE80211_HTINFO_2NDCHAN 0x03 /* secondary/ext chan offset */
-@@ -740,7 +740,7 @@
+@@ -740,7 +740,7 @@ struct ieee80211_tim_ie {
uint8_t tim_period; /* DTIM period */
uint8_t tim_bitctl; /* bitmap control */
uint8_t tim_bitmap[1]; /* variable-length bitmap */
@@ -257,7 +264,7 @@
struct ieee80211_country_ie {
uint8_t ie; /* IEEE80211_ELEMID_COUNTRY */
-@@ -750,8 +750,8 @@
+@@ -750,8 +750,8 @@ struct ieee80211_country_ie {
uint8_t schan; /* starting channel */
uint8_t nchan; /* number channels */
uint8_t maxtxpwr; /* tx power cap */
@@ -268,7 +275,7 @@
#define IEEE80211_COUNTRY_MAX_BANDS 84 /* max possible bands */
#define IEEE80211_COUNTRY_MAX_SIZE \
-@@ -766,7 +766,7 @@
+@@ -766,7 +766,7 @@ struct ieee80211_csa_ie {
uint8_t csa_mode; /* Channel Switch Mode */
uint8_t csa_newchan; /* New Channel Number */
uint8_t csa_count; /* Channel Switch Count */
@@ -277,11 +284,9 @@
/*
* Note the min acceptable CSA count is used to guard against
-Index: b/sys/sys/ata.h
-===================================================================
--- a/sys/sys/ata.h
+++ b/sys/sys/ata.h
-@@ -185,7 +185,7 @@
+@@ -185,7 +185,7 @@ struct ata_params {
#define ATA_SUPPORT_WRITEDMAQFUAEXT 0x0080
#define ATA_SUPPORT_64BITWWN 0x0100
#define ATA_SUPPORT_UNLOAD 0x2000
@@ -290,7 +295,7 @@
/*088*/ u_int16_t udmamodes; /* UltraDMA modes */
/*089*/ u_int16_t erase_time;
-@@ -258,7 +258,7 @@
+@@ -258,7 +258,7 @@ struct ata_params {
/*223*/ u_int16_t transport_minor;
u_int16_t reserved224[31];
/*255*/ u_int16_t integrity;
@@ -299,7 +304,7 @@
/* ATA transfer modes */
-@@ -474,7 +474,7 @@
+@@ -474,7 +474,7 @@ struct atapi_sense {
u_int8_t specific1; /* sense key specific */
u_int8_t specific2; /* sense key specific */
@@ -308,11 +313,9 @@
struct ata_ioc_request {
union {
-Index: b/sys/dev/ata/atapi-cd.h
-===================================================================
--- a/sys/dev/ata/atapi-cd.h
+++ b/sys/dev/ata/atapi-cd.h
-@@ -267,7 +267,7 @@
+@@ -267,7 +267,7 @@ struct write_param {
u_int8_t vendor_specific_byte1;
u_int8_t vendor_specific_byte2;
u_int8_t vendor_specific_byte3;
@@ -321,11 +324,9 @@
/* CDROM Read Track Information structure */
struct acd_track_info {
-Index: b/sys/dev/ciss/cissio.h
-===================================================================
--- a/sys/dev/ciss/cissio.h
+++ b/sys/dev/ciss/cissio.h
-@@ -108,18 +108,18 @@
+@@ -108,18 +108,18 @@ typedef union {
u_int8_t Dev;
u_int8_t Bus:6;
u_int8_t Mode:2;
@@ -347,7 +348,7 @@
} SCSI3Addr_struct;
typedef struct {
-@@ -127,20 +127,20 @@
+@@ -127,20 +127,20 @@ typedef struct {
u_int32_t Bus:6;
u_int32_t Mode:2;
SCSI3Addr_struct Target[2];
@@ -371,7 +372,7 @@
typedef struct {
u_int8_t CDBLen;
-@@ -148,24 +148,24 @@
+@@ -148,24 +148,24 @@ typedef struct {
u_int8_t Type:3;
u_int8_t Attribute:3;
u_int8_t Direction:2;
@@ -401,7 +402,7 @@
typedef struct {
u_int8_t ScsiStatus;
-@@ -174,7 +174,7 @@
+@@ -174,7 +174,7 @@ typedef struct {
u_int32_t ResidualCnt;
MoreErrInfo_struct MoreErrInfo;
u_int8_t SenseInfo[SENSEINFOBYTES];
@@ -410,7 +411,7 @@
typedef struct {
LUNAddr_struct LUN_info; /* 8 */
-@@ -182,7 +182,7 @@
+@@ -182,7 +182,7 @@ typedef struct {
ErrorInfo_struct error_info; /* 48 */
u_int16_t buf_size; /* 2 */
u_int8_t *buf; /* 4 */
@@ -419,7 +420,7 @@
#ifdef __amd64__
typedef struct {
-@@ -191,7 +191,7 @@
+@@ -191,7 +191,7 @@ typedef struct {
ErrorInfo_struct error_info; /* 48 */
u_int16_t buf_size; /* 2 */
u_int32_t buf; /* 4 */
@@ -428,11 +429,9 @@
#endif
/************************************************************************
-Index: b/sys/amd64/include/segments.h
-===================================================================
--- a/sys/amd64/include/segments.h
+++ b/sys/amd64/include/segments.h
-@@ -72,7 +72,7 @@
+@@ -72,7 +72,7 @@ struct user_segment_descriptor {
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) */
@@ -441,7 +440,7 @@
/*
* System segment descriptors (128 bit wide)
-@@ -86,11 +86,11 @@
+@@ -86,11 +86,11 @@ struct system_segment_descriptor {
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)*/
@@ -455,7 +454,7 @@
/*
* Gate descriptors (e.g. indirect descriptors, trap, interrupt etc. 128 bit)
-@@ -104,9 +104,9 @@
+@@ -104,9 +104,9 @@ struct gate_descriptor {
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 */
@@ -467,7 +466,7 @@
/*
* Generic descriptor
-@@ -167,15 +167,15 @@
+@@ -167,15 +167,15 @@ struct soft_segment_descriptor {
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)*/
@@ -488,7 +487,7 @@
* Size of IDT table
--- a/sys/net80211/ieee80211_ioctl.h
+++ b/sys/net80211/ieee80211_ioctl.h
-@@ -321,7 +321,7 @@
+@@ -321,7 +321,7 @@ enum {
struct ieee80211req_maclist {
uint8_t ml_macaddr[IEEE80211_ADDR_LEN];
Modified: trunk/kfreebsd-kernel-headers/debian/patches/024_ioccom.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/024_ioccom.diff 2011-06-07 04:26:34 UTC (rev 3409)
+++ trunk/kfreebsd-kernel-headers/debian/patches/024_ioccom.diff 2011-06-07 04:53:48 UTC (rev 3410)
@@ -1,6 +1,10 @@
---- src/sys/sys/ioccom.h~ 2006-11-18 00:35:03.000000000 +0100
-+++ src/sys/sys/ioccom.h 2006-11-18 00:35:03.000000000 +0100
-@@ -63,7 +63,7 @@
+---
+ sys/sys/ioccom.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sys/sys/ioccom.h
++++ b/sys/sys/ioccom.h
+@@ -72,7 +72,7 @@
#include <sys/cdefs.h>
__BEGIN_DECLS
Modified: trunk/kfreebsd-kernel-headers/debian/patches/025_iconv.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/025_iconv.diff 2011-06-07 04:26:34 UTC (rev 3409)
+++ trunk/kfreebsd-kernel-headers/debian/patches/025_iconv.diff 2011-06-07 04:53:48 UTC (rev 3410)
@@ -1,6 +1,10 @@
---- src/sys/sys/iconv.h~ 2006-11-18 12:22:08.000000000 +0100
-+++ src/sys/sys/iconv.h 2006-11-18 12:22:08.000000000 +0100
-@@ -91,7 +91,7 @@
+---
+ sys/sys/iconv.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sys/sys/iconv.h
++++ b/sys/sys/iconv.h
+@@ -94,7 +94,7 @@ __BEGIN_DECLS
#define ENCODING_UNICODE "UTF-16BE"
#define KICONV_VENDOR_MICSFT 1 /* Microsoft Vendor Code for quirk */
Modified: trunk/kfreebsd-kernel-headers/debian/patches/026_acpiio.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/026_acpiio.diff 2011-06-07 04:26:34 UTC (rev 3409)
+++ trunk/kfreebsd-kernel-headers/debian/patches/026_acpiio.diff 2011-06-07 04:53:48 UTC (rev 3410)
@@ -1,5 +1,9 @@
---- src/sys/dev/acpica/acpiio.h~ 2006-11-18 16:33:36.000000000 +0100
-+++ src/sys/dev/acpica/acpiio.h 2006-11-18 16:33:36.000000000 +0100
+---
+ sys/dev/acpica/acpiio.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/sys/dev/acpica/acpiio.h
++++ b/sys/dev/acpica/acpiio.h
@@ -30,6 +30,8 @@
#ifndef _ACPIIO_H_
#define _ACPIIO_H_
Modified: trunk/kfreebsd-kernel-headers/debian/patches/027_ktrace.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/027_ktrace.diff 2011-06-07 04:26:34 UTC (rev 3409)
+++ trunk/kfreebsd-kernel-headers/debian/patches/027_ktrace.diff 2011-06-07 04:53:48 UTC (rev 3410)
@@ -1,5 +1,9 @@
---- src/sys/sys/ktrace.h 2006-06-25 11:40:55.000000000 +0200
-+++ src/sys/sys/ktrace.h 2006-11-20 10:32:42.000000000 +0100
+---
+ sys/sys/ktrace.h | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+--- a/sys/sys/ktrace.h
++++ b/sys/sys/ktrace.h
@@ -33,6 +33,19 @@
#ifndef _SYS_KTRACE_H_
#define _SYS_KTRACE_H_
Modified: trunk/kfreebsd-kernel-headers/debian/patches/028_fbio.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/028_fbio.diff 2011-06-07 04:26:34 UTC (rev 3409)
+++ trunk/kfreebsd-kernel-headers/debian/patches/028_fbio.diff 2011-06-07 04:53:48 UTC (rev 3410)
@@ -1,5 +1,9 @@
---- src/sys/sys/fbio.h~ 2006-11-29 10:35:33.000000000 +0100
-+++ src/sys/sys/fbio.h 2006-11-29 10:35:33.000000000 +0100
+---
+ sys/sys/fbio.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sys/sys/fbio.h
++++ b/sys/sys/fbio.h
@@ -39,7 +39,7 @@
#define _SYS_FBIO_H_
Modified: trunk/kfreebsd-kernel-headers/debian/patches/029_conf.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/029_conf.diff 2011-06-07 04:26:34 UTC (rev 3409)
+++ trunk/kfreebsd-kernel-headers/debian/patches/029_conf.diff 2011-06-07 04:53:48 UTC (rev 3410)
@@ -1,3 +1,7 @@
+---
+ sys/sys/conf.h | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
--- a/sys/sys/conf.h
+++ b/sys/sys/conf.h
@@ -43,6 +43,7 @@
@@ -8,7 +12,7 @@
#include <sys/queue.h>
#endif
-@@ -268,10 +269,10 @@
+@@ -268,10 +269,10 @@ void dev_refl(struct cdev *dev);
void dev_rel(struct cdev *dev);
void dev_strategy(struct cdev *dev, struct buf *bp);
struct cdev *make_dev(struct cdevsw *_devsw, int _unit, uid_t _uid, gid_t _gid,
@@ -21,7 +25,7 @@
#define MAKEDEV_REF 0x01
#define MAKEDEV_WHTOUT 0x02
#define MAKEDEV_NOWAIT 0x04
-@@ -280,12 +281,11 @@
+@@ -280,12 +281,11 @@ struct cdev *make_dev_cred(struct cdevsw
struct cdev *make_dev_credf(int _flags,
struct cdevsw *_devsw, int _unit,
struct ucred *_cr, uid_t _uid, gid_t _gid, int _mode,
Modified: trunk/kfreebsd-kernel-headers/debian/patches/030_pfvar.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/030_pfvar.diff 2011-06-07 04:26:34 UTC (rev 3409)
+++ trunk/kfreebsd-kernel-headers/debian/patches/030_pfvar.diff 2011-06-07 04:53:48 UTC (rev 3410)
@@ -1,3 +1,7 @@
+---
+ sys/contrib/pf/net/pfvar.h | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
--- a/sys/contrib/pf/net/pfvar.h
+++ b/sys/contrib/pf/net/pfvar.h
@@ -40,13 +40,14 @@
Modified: trunk/kfreebsd-kernel-headers/debian/patches/031_ufs.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/031_ufs.diff 2011-06-07 04:26:34 UTC (rev 3409)
+++ trunk/kfreebsd-kernel-headers/debian/patches/031_ufs.diff 2011-06-07 04:53:48 UTC (rev 3410)
@@ -1,8 +1,10 @@
-Index: src/sys/ufs/ufs/quota.h
-===================================================================
---- src/sys/ufs/ufs/quota.h.orig
-+++ src/sys/ufs/ufs/quota.h
-@@ -205,7 +205,6 @@
+---
+ sys/ufs/ufs/quota.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/sys/ufs/ufs/quota.h
++++ b/sys/ufs/ufs/quota.h
+@@ -205,7 +205,6 @@ int quotaoff(struct thread *td, struct m
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 *);
Modified: trunk/kfreebsd-kernel-headers/debian/patches/032_vnode.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/032_vnode.diff 2011-06-07 04:26:34 UTC (rev 3409)
+++ trunk/kfreebsd-kernel-headers/debian/patches/032_vnode.diff 2011-06-07 04:53:48 UTC (rev 3410)
@@ -1,6 +1,10 @@
---- src/sys/sys/vnode.h~
-+++ src/sys/sys/vnode.h
-@@ -47,7 +47,6 @@
+---
+ sys/sys/vnode.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/sys/sys/vnode.h
++++ b/sys/sys/vnode.h
+@@ -40,7 +40,6 @@
#include <sys/mutex.h>
#include <sys/selinfo.h>
#include <sys/uio.h>
Modified: trunk/kfreebsd-kernel-headers/debian/patches/033_pcpu.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/033_pcpu.diff 2011-06-07 04:26:34 UTC (rev 3409)
+++ trunk/kfreebsd-kernel-headers/debian/patches/033_pcpu.diff 2011-06-07 04:53:48 UTC (rev 3410)
@@ -1,3 +1,7 @@
+---
+ sys/sys/pcpu.h | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
--- a/sys/sys/pcpu.h
+++ b/sys/sys/pcpu.h
@@ -41,6 +41,8 @@
@@ -9,7 +13,7 @@
/*
* Define a set for pcpu data.
-@@ -150,7 +152,7 @@
+@@ -150,7 +152,7 @@ struct pcpu {
struct thread *pc_fpcurthread; /* Fp state owner */
struct thread *pc_deadthread; /* Zombie thread or NULL */
struct pcb *pc_curpcb; /* Current pcb */
Modified: trunk/kfreebsd-kernel-headers/debian/patches/034_usb.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/034_usb.diff 2011-06-07 04:26:34 UTC (rev 3409)
+++ trunk/kfreebsd-kernel-headers/debian/patches/034_usb.diff 2011-06-07 04:53:48 UTC (rev 3410)
@@ -2,11 +2,13 @@
add some backward compatibility with previous USB stack
-Index: kfreebsd-source-8.0/sys/dev/usb/usb.h
-===================================================================
---- kfreebsd-source-8.0.orig/sys/dev/usb/usb.h
-+++ kfreebsd-source-8.0/sys/dev/usb/usb.h
-@@ -727,4 +727,12 @@
+---
+ sys/dev/usb/usb.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/sys/dev/usb/usb.h
++++ b/sys/dev/usb/usb.h
+@@ -752,4 +752,12 @@ enum usb_dev_state {
USB_STATE_CONFIGURED,
};
#define USB_STATE_MAX (USB_STATE_CONFIGURED+1)
Modified: trunk/kfreebsd-kernel-headers/debian/patches/035_devfs_int.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/035_devfs_int.diff 2011-06-07 04:26:34 UTC (rev 3409)
+++ trunk/kfreebsd-kernel-headers/debian/patches/035_devfs_int.diff 2011-06-07 04:53:48 UTC (rev 3410)
@@ -1,6 +1,10 @@
---- kfreebsd-source-8.0.orig/sys/fs/devfs/devfs_int.h
-+++ kfreebsd-source-8.0/sys/fs/devfs/devfs_int.h
-@@ -68,6 +68,9 @@
+---
+ sys/fs/devfs/devfs_int.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/sys/fs/devfs/devfs_int.h
++++ b/sys/fs/devfs/devfs_int.h
+@@ -68,6 +68,9 @@ struct cdev_priv {
LIST_HEAD(, cdev_privdata) cdp_fdpriv;
};
@@ -9,4 +13,4 @@
+
#define cdev2priv(c) member2struct(cdev_priv, cdp_c, c)
- struct cdev *devfs_alloc(void);
+ struct cdev *devfs_alloc(int);
Modified: trunk/kfreebsd-kernel-headers/debian/patches/036_tcpvar.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/036_tcpvar.diff 2011-06-07 04:26:34 UTC (rev 3409)
+++ trunk/kfreebsd-kernel-headers/debian/patches/036_tcpvar.diff 2011-06-07 04:53:48 UTC (rev 3410)
@@ -1,3 +1,7 @@
+---
+ sys/netinet/tcp_var.h | 1 +
+ 1 file changed, 1 insertion(+)
+
--- a/sys/netinet/tcp_var.h
+++ b/sys/netinet/tcp_var.h
@@ -33,6 +33,7 @@
Modified: trunk/kfreebsd-kernel-headers/debian/patches/037_ciss.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/037_ciss.diff 2011-06-07 04:26:34 UTC (rev 3409)
+++ trunk/kfreebsd-kernel-headers/debian/patches/037_ciss.diff 2011-06-07 04:53:48 UTC (rev 3410)
@@ -1,3 +1,7 @@
+---
+ sys/dev/ciss/cissio.h | 1 +
+ 1 file changed, 1 insertion(+)
+
--- a/sys/dev/ciss/cissio.h
+++ b/sys/dev/ciss/cissio.h
@@ -35,6 +35,7 @@
Modified: trunk/kfreebsd-kernel-headers/debian/patches/038_gnuclike.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/038_gnuclike.diff 2011-06-07 04:26:34 UTC (rev 3409)
+++ trunk/kfreebsd-kernel-headers/debian/patches/038_gnuclike.diff 2011-06-07 04:53:48 UTC (rev 3410)
@@ -1,3 +1,30 @@
+---
+ sys/amd64/include/_types.h | 2 +-
+ sys/amd64/include/atomic.h | 4 ++--
+ sys/amd64/include/bus.h | 38 +++++++++++++++++++-------------------
+ sys/amd64/include/cpufunc.h | 2 +-
+ sys/amd64/include/endian.h | 2 +-
+ sys/amd64/include/ieeefp.h | 4 ++--
+ sys/amd64/include/pcpu.h | 2 +-
+ sys/amd64/include/profile.h | 6 +++---
+ sys/amd64/include/stdarg.h | 2 +-
+ sys/amd64/include/varargs.h | 4 ++--
+ sys/i386/include/_types.h | 4 ++--
+ sys/i386/include/atomic.h | 4 ++--
+ sys/i386/include/bus.h | 38 +++++++++++++++++++-------------------
+ sys/i386/include/cpufunc.h | 2 +-
+ sys/i386/include/endian.h | 2 +-
+ sys/i386/include/ieeefp.h | 2 +-
+ sys/i386/include/in_cksum.h | 4 ++--
+ sys/i386/include/pcpu.h | 2 +-
+ sys/i386/include/profile.h | 6 +++---
+ sys/i386/include/stdarg.h | 4 ++--
+ sys/i386/include/varargs.h | 4 ++--
+ sys/mips/include/_types.h | 6 +++---
+ sys/mips/include/endian.h | 2 +-
+ sys/sys/linker_set.h | 2 +-
+ 24 files changed, 74 insertions(+), 74 deletions(-)
+
--- a/sys/amd64/include/atomic.h
+++ b/sys/amd64/include/atomic.h
@@ -71,7 +71,7 @@
@@ -9,7 +36,7 @@
#define ATOMIC_ASM(NAME, TYPE, OP, CONS, V) \
void atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v); \
void atomic_##NAME##_barr_##TYPE(volatile u_##TYPE *p, u_##TYPE v)
-@@ -303,7 +303,7 @@
+@@ -303,7 +303,7 @@ ATOMIC_STORE_LOAD(long, "cmpxchgq %0,%1"
#ifndef WANT_FUNCTIONS
/* Read the current value and store a zero in the destination. */
@@ -20,7 +47,7 @@
atomic_readandclear_int(volatile u_int *addr)
--- a/sys/amd64/include/bus.h
+++ b/sys/amd64/include/bus.h
-@@ -272,7 +272,7 @@
+@@ -272,7 +272,7 @@ bus_space_read_multi_1(bus_space_tag_t t
if (tag == AMD64_BUS_SPACE_IO)
insb(bsh + offset, addr, count);
else {
@@ -29,7 +56,7 @@
__asm __volatile(" \n\
cld \n\
1: movb (%2),%%al \n\
-@@ -293,7 +293,7 @@
+@@ -293,7 +293,7 @@ bus_space_read_multi_2(bus_space_tag_t t
if (tag == AMD64_BUS_SPACE_IO)
insw(bsh + offset, addr, count);
else {
@@ -38,7 +65,7 @@
__asm __volatile(" \n\
cld \n\
1: movw (%2),%%ax \n\
-@@ -314,7 +314,7 @@
+@@ -314,7 +314,7 @@ bus_space_read_multi_4(bus_space_tag_t t
if (tag == AMD64_BUS_SPACE_IO)
insl(bsh + offset, addr, count);
else {
@@ -47,7 +74,7 @@
__asm __volatile(" \n\
cld \n\
1: movl (%2),%%eax \n\
-@@ -359,7 +359,7 @@
+@@ -359,7 +359,7 @@ bus_space_read_region_1(bus_space_tag_t
if (tag == AMD64_BUS_SPACE_IO) {
int _port_ = bsh + offset;
@@ -56,7 +83,7 @@
__asm __volatile(" \n\
cld \n\
1: inb %w2,%%al \n\
-@@ -372,7 +372,7 @@
+@@ -372,7 +372,7 @@ bus_space_read_region_1(bus_space_tag_t
#endif
} else {
bus_space_handle_t _port_ = bsh + offset;
@@ -65,7 +92,7 @@
__asm __volatile(" \n\
cld \n\
repne \n\
-@@ -391,7 +391,7 @@
+@@ -391,7 +391,7 @@ bus_space_read_region_2(bus_space_tag_t
if (tag == AMD64_BUS_SPACE_IO) {
int _port_ = bsh + offset;
@@ -74,7 +101,7 @@
__asm __volatile(" \n\
cld \n\
1: inw %w2,%%ax \n\
-@@ -404,7 +404,7 @@
+@@ -404,7 +404,7 @@ bus_space_read_region_2(bus_space_tag_t
#endif
} else {
bus_space_handle_t _port_ = bsh + offset;
@@ -83,7 +110,7 @@
__asm __volatile(" \n\
cld \n\
repne \n\
-@@ -423,7 +423,7 @@
+@@ -423,7 +423,7 @@ bus_space_read_region_4(bus_space_tag_t
if (tag == AMD64_BUS_SPACE_IO) {
int _port_ = bsh + offset;
@@ -92,7 +119,7 @@
__asm __volatile(" \n\
cld \n\
1: inl %w2,%%eax \n\
-@@ -436,7 +436,7 @@
+@@ -436,7 +436,7 @@ bus_space_read_region_4(bus_space_tag_t
#endif
} else {
bus_space_handle_t _port_ = bsh + offset;
@@ -101,7 +128,7 @@
__asm __volatile(" \n\
cld \n\
repne \n\
-@@ -536,7 +536,7 @@
+@@ -536,7 +536,7 @@ bus_space_write_multi_1(bus_space_tag_t
if (tag == AMD64_BUS_SPACE_IO)
outsb(bsh + offset, addr, count);
else {
@@ -110,7 +137,7 @@
__asm __volatile(" \n\
cld \n\
1: lodsb \n\
-@@ -557,7 +557,7 @@
+@@ -557,7 +557,7 @@ bus_space_write_multi_2(bus_space_tag_t
if (tag == AMD64_BUS_SPACE_IO)
outsw(bsh + offset, addr, count);
else {
@@ -119,7 +146,7 @@
__asm __volatile(" \n\
cld \n\
1: lodsw \n\
-@@ -578,7 +578,7 @@
+@@ -578,7 +578,7 @@ bus_space_write_multi_4(bus_space_tag_t
if (tag == AMD64_BUS_SPACE_IO)
outsl(bsh + offset, addr, count);
else {
@@ -128,7 +155,7 @@
__asm __volatile(" \n\
cld \n\
1: lodsl \n\
-@@ -624,7 +624,7 @@
+@@ -624,7 +624,7 @@ bus_space_write_region_1(bus_space_tag_t
if (tag == AMD64_BUS_SPACE_IO) {
int _port_ = bsh + offset;
@@ -137,7 +164,7 @@
__asm __volatile(" \n\
cld \n\
1: lodsb \n\
-@@ -637,7 +637,7 @@
+@@ -637,7 +637,7 @@ bus_space_write_region_1(bus_space_tag_t
#endif
} else {
bus_space_handle_t _port_ = bsh + offset;
@@ -146,7 +173,7 @@
__asm __volatile(" \n\
cld \n\
repne \n\
-@@ -656,7 +656,7 @@
+@@ -656,7 +656,7 @@ bus_space_write_region_2(bus_space_tag_t
if (tag == AMD64_BUS_SPACE_IO) {
int _port_ = bsh + offset;
@@ -155,7 +182,7 @@
__asm __volatile(" \n\
cld \n\
1: lodsw \n\
-@@ -669,7 +669,7 @@
+@@ -669,7 +669,7 @@ bus_space_write_region_2(bus_space_tag_t
#endif
} else {
bus_space_handle_t _port_ = bsh + offset;
@@ -164,7 +191,7 @@
__asm __volatile(" \n\
cld \n\
repne \n\
-@@ -688,7 +688,7 @@
+@@ -688,7 +688,7 @@ bus_space_write_region_4(bus_space_tag_t
if (tag == AMD64_BUS_SPACE_IO) {
int _port_ = bsh + offset;
@@ -173,7 +200,7 @@
__asm __volatile(" \n\
cld \n\
1: lodsl \n\
-@@ -701,7 +701,7 @@
+@@ -701,7 +701,7 @@ bus_space_write_region_4(bus_space_tag_t
#endif
} else {
bus_space_handle_t _port_ = bsh + offset;
@@ -182,7 +209,7 @@
__asm __volatile(" \n\
cld \n\
repne \n\
-@@ -996,7 +996,7 @@
+@@ -996,7 +996,7 @@ static __inline void
bus_space_barrier(bus_space_tag_t tag __unused, bus_space_handle_t bsh __unused,
bus_size_t offset __unused, bus_size_t len __unused, int flags)
{
@@ -193,7 +220,7 @@
else
--- a/sys/amd64/include/cpufunc.h
+++ b/sys/amd64/include/cpufunc.h
-@@ -55,7 +55,7 @@
+@@ -55,7 +55,7 @@ struct region_descriptor;
#define writel(va, d) (*(volatile u_int32_t *) (va) = (d))
#define writeq(va, d) (*(volatile u_int64_t *) (va) = (d))
@@ -204,7 +231,7 @@
breakpoint(void)
--- a/sys/amd64/include/endian.h
+++ b/sys/amd64/include/endian.h
-@@ -67,7 +67,7 @@
+@@ -67,7 +67,7 @@ extern "C" {
#define BYTE_ORDER _BYTE_ORDER
#endif
@@ -215,7 +242,7 @@
__extension__ ({ register __uint32_t __X = (x); \
--- a/sys/amd64/include/ieeefp.h
+++ b/sys/amd64/include/ieeefp.h
-@@ -122,7 +122,7 @@
+@@ -122,7 +122,7 @@ typedef enum {
#define SSE_RND_OFF 13 /* rounding control offset */
#define SSE_FZ_OFF 15 /* flush to zero offset */
@@ -224,7 +251,7 @@
#define __fldcw(addr) __asm __volatile("fldcw %0" : : "m" (*(addr)))
#define __fldenv(addr) __asm __volatile("fldenv %0" : : "m" (*(addr)))
-@@ -277,7 +277,7 @@
+@@ -277,7 +277,7 @@ __fpgetsticky(void)
#endif /* __GNUCLIKE_ASM */
@@ -235,7 +262,7 @@
#define fpgetprec() __fpgetprec()
--- a/sys/amd64/include/pcpu.h
+++ b/sys/amd64/include/pcpu.h
-@@ -91,7 +91,7 @@
+@@ -91,7 +91,7 @@ extern struct pcpu *pcpup;
#define PCPU_PTR(member) (&pcpup->pc_ ## member)
#define PCPU_SET(member, val) (pcpup->pc_ ## member = (val))
@@ -255,7 +282,7 @@
#define MCOUNT_OVERHEAD(label) \
__asm __volatile("pushq %0; call __mcount; popq %%rcx" \
: \
-@@ -112,7 +112,7 @@
+@@ -112,7 +112,7 @@ void user(void);
static void _mcount(uintfptr_t frompc, uintfptr_t selfpc) __used; \
static void _mcount
@@ -264,7 +291,7 @@
#define MCOUNT __asm(" \n\
.text \n\
.p2align 4,0x90 \n\
-@@ -191,7 +191,7 @@
+@@ -191,7 +191,7 @@ void mcount(uintfptr_t frompc, uintfptr_
#include <sys/cdefs.h>
__BEGIN_DECLS
@@ -286,7 +313,7 @@
__builtin_va_start((ap), (last))
--- a/sys/amd64/include/_types.h
+++ b/sys/amd64/include/_types.h
-@@ -110,7 +110,7 @@
+@@ -110,7 +110,7 @@ typedef __uint64_t __vm_size_t;
/*
* Unusual type definitions.
*/
@@ -306,7 +333,7 @@
#include <sys/_types.h>
-@@ -71,7 +71,7 @@
+@@ -71,7 +71,7 @@ typedef char *va_list;
#define __va_size(type) \
(((sizeof(type) + sizeof(int) - 1) / sizeof(int)) * sizeof(int))
@@ -326,7 +353,7 @@
#define ATOMIC_ASM(NAME, TYPE, OP, CONS, V) \
void atomic_##NAME##_##TYPE(volatile u_##TYPE *p, u_##TYPE v); \
void atomic_##NAME##_barr_##TYPE(volatile u_##TYPE *p, u_##TYPE v)
-@@ -307,7 +307,7 @@
+@@ -307,7 +307,7 @@ atomic_fetchadd_long(volatile u_long *p,
}
/* Read the current value and store a zero in the destination. */
@@ -337,7 +364,7 @@
atomic_readandclear_int(volatile u_int *addr)
--- a/sys/i386/include/bus.h
+++ b/sys/i386/include/bus.h
-@@ -276,7 +276,7 @@
+@@ -276,7 +276,7 @@ bus_space_read_multi_1(bus_space_tag_t t
if (tag == I386_BUS_SPACE_IO)
insb(bsh + offset, addr, count);
else {
@@ -346,7 +373,7 @@
__asm __volatile(" \n\
cld \n\
1: movb (%2),%%al \n\
-@@ -301,7 +301,7 @@
+@@ -301,7 +301,7 @@ bus_space_read_multi_2(bus_space_tag_t t
if (tag == I386_BUS_SPACE_IO)
insw(bsh + offset, addr, count);
else {
@@ -355,7 +382,7 @@
__asm __volatile(" \n\
cld \n\
1: movw (%2),%%ax \n\
-@@ -326,7 +326,7 @@
+@@ -326,7 +326,7 @@ bus_space_read_multi_4(bus_space_tag_t t
if (tag == I386_BUS_SPACE_IO)
insl(bsh + offset, addr, count);
else {
@@ -364,7 +391,7 @@
__asm __volatile(" \n\
cld \n\
1: movl (%2),%%eax \n\
-@@ -375,7 +375,7 @@
+@@ -375,7 +375,7 @@ bus_space_read_region_1(bus_space_tag_t
if (tag == I386_BUS_SPACE_IO) {
int _port_ = bsh + offset;
@@ -373,7 +400,7 @@
__asm __volatile(" \n\
cld \n\
1: inb %w2,%%al \n\
-@@ -392,7 +392,7 @@
+@@ -392,7 +392,7 @@ bus_space_read_region_1(bus_space_tag_t
#endif
} else {
int _port_ = bsh + offset;
@@ -382,7 +409,7 @@
__asm __volatile(" \n\
cld \n\
repne \n\
-@@ -415,7 +415,7 @@
+@@ -415,7 +415,7 @@ bus_space_read_region_2(bus_space_tag_t
if (tag == I386_BUS_SPACE_IO) {
int _port_ = bsh + offset;
@@ -391,7 +418,7 @@
__asm __volatile(" \n\
cld \n\
1: inw %w2,%%ax \n\
-@@ -432,7 +432,7 @@
+@@ -432,7 +432,7 @@ bus_space_read_region_2(bus_space_tag_t
#endif
} else {
int _port_ = bsh + offset;
@@ -400,7 +427,7 @@
__asm __volatile(" \n\
cld \n\
repne \n\
-@@ -455,7 +455,7 @@
+@@ -455,7 +455,7 @@ bus_space_read_region_4(bus_space_tag_t
if (tag == I386_BUS_SPACE_IO) {
int _port_ = bsh + offset;
@@ -409,7 +436,7 @@
__asm __volatile(" \n\
cld \n\
1: inl %w2,%%eax \n\
-@@ -472,7 +472,7 @@
+@@ -472,7 +472,7 @@ bus_space_read_region_4(bus_space_tag_t
#endif
} else {
int _port_ = bsh + offset;
@@ -418,7 +445,7 @@
__asm __volatile(" \n\
cld \n\
repne \n\
-@@ -576,7 +576,7 @@
+@@ -576,7 +576,7 @@ bus_space_write_multi_1(bus_space_tag_t
if (tag == I386_BUS_SPACE_IO)
outsb(bsh + offset, addr, count);
else {
@@ -427,7 +454,7 @@
__asm __volatile(" \n\
cld \n\
1: lodsb \n\
-@@ -601,7 +601,7 @@
+@@ -601,7 +601,7 @@ bus_space_write_multi_2(bus_space_tag_t
if (tag == I386_BUS_SPACE_IO)
outsw(bsh + offset, addr, count);
else {
@@ -436,7 +463,7 @@
__asm __volatile(" \n\
cld \n\
1: lodsw \n\
-@@ -626,7 +626,7 @@
+@@ -626,7 +626,7 @@ bus_space_write_multi_4(bus_space_tag_t
if (tag == I386_BUS_SPACE_IO)
outsl(bsh + offset, addr, count);
else {
@@ -445,7 +472,7 @@
__asm __volatile(" \n\
cld \n\
1: lodsl \n\
-@@ -676,7 +676,7 @@
+@@ -676,7 +676,7 @@ bus_space_write_region_1(bus_space_tag_t
if (tag == I386_BUS_SPACE_IO) {
int _port_ = bsh + offset;
@@ -454,7 +481,7 @@
__asm __volatile(" \n\
cld \n\
1: lodsb \n\
-@@ -693,7 +693,7 @@
+@@ -693,7 +693,7 @@ bus_space_write_region_1(bus_space_tag_t
#endif
} else {
int _port_ = bsh + offset;
@@ -463,7 +490,7 @@
__asm __volatile(" \n\
cld \n\
repne \n\
-@@ -716,7 +716,7 @@
+@@ -716,7 +716,7 @@ bus_space_write_region_2(bus_space_tag_t
if (tag == I386_BUS_SPACE_IO) {
int _port_ = bsh + offset;
@@ -472,7 +499,7 @@
__asm __volatile(" \n\
cld \n\
1: lodsw \n\
-@@ -733,7 +733,7 @@
+@@ -733,7 +733,7 @@ bus_space_write_region_2(bus_space_tag_t
#endif
} else {
int _port_ = bsh + offset;
@@ -481,7 +508,7 @@
__asm __volatile(" \n\
cld \n\
repne \n\
-@@ -756,7 +756,7 @@
+@@ -756,7 +756,7 @@ bus_space_write_region_4(bus_space_tag_t
if (tag == I386_BUS_SPACE_IO) {
int _port_ = bsh + offset;
@@ -490,7 +517,7 @@
__asm __volatile(" \n\
cld \n\
1: lodsl \n\
-@@ -773,7 +773,7 @@
+@@ -773,7 +773,7 @@ bus_space_write_region_4(bus_space_tag_t
#endif
} else {
int _port_ = bsh + offset;
@@ -499,7 +526,7 @@
__asm __volatile(" \n\
cld \n\
repne \n\
-@@ -1072,7 +1072,7 @@
+@@ -1072,7 +1072,7 @@ static __inline void
bus_space_barrier(bus_space_tag_t tag __unused, bus_space_handle_t bsh __unused,
bus_size_t offset __unused, bus_size_t len __unused, int flags)
{
@@ -510,7 +537,7 @@
else
--- a/sys/i386/include/cpufunc.h
+++ b/sys/i386/include/cpufunc.h
-@@ -65,7 +65,7 @@
+@@ -65,7 +65,7 @@ struct region_descriptor;
#define writew(va, d) (*(volatile u_int16_t *) (va) = (d))
#define writel(va, d) (*(volatile u_int32_t *) (va) = (d))
@@ -521,7 +548,7 @@
breakpoint(void)
--- a/sys/i386/include/endian.h
+++ b/sys/i386/include/endian.h
-@@ -67,7 +67,7 @@
+@@ -67,7 +67,7 @@ extern "C" {
#define BYTE_ORDER _BYTE_ORDER
#endif
@@ -532,7 +559,7 @@
__extension__ ({ register __uint32_t __X = (x); \
--- a/sys/i386/include/ieeefp.h
+++ b/sys/i386/include/ieeefp.h
-@@ -104,7 +104,7 @@
+@@ -104,7 +104,7 @@ typedef enum {
*/
#define FP_STKY_OFF 0 /* sticky flags offset */
@@ -552,7 +579,7 @@
static __inline u_int
in_cksum_hdr(const struct ip *ip)
{
-@@ -131,7 +131,7 @@
+@@ -131,7 +131,7 @@ in_pseudo(u_int sum, u_int b, u_int c)
#endif
#ifdef _KERNEL
@@ -563,7 +590,7 @@
u_short in_pseudo(u_int sum, u_int b, u_int c);
--- a/sys/i386/include/pcpu.h
+++ b/sys/i386/include/pcpu.h
-@@ -103,7 +103,7 @@
+@@ -103,7 +103,7 @@ extern struct pcpu *pcpup;
#define PCPU_PTR(member) (&pcpup->pc_ ## member)
#define PCPU_SET(member, val) (pcpup->pc_ ## member = (val))
@@ -583,7 +610,7 @@
#define MCOUNT_OVERHEAD(label) \
__asm __volatile("pushl %0; call __mcount; popl %%ecx" \
: \
-@@ -110,7 +110,7 @@
+@@ -110,7 +110,7 @@ void user(void);
#define _MCOUNT_DECL static __inline void _mcount
@@ -592,7 +619,7 @@
#define MCOUNT \
void \
mcount() \
-@@ -165,7 +165,7 @@
+@@ -165,7 +165,7 @@ void mcount(uintfptr_t frompc, uintfptr_
#include <sys/cdefs.h>
__BEGIN_DECLS
@@ -612,7 +639,7 @@
#define va_start(ap, last) \
__builtin_va_start((ap), (last))
-@@ -67,7 +67,7 @@
+@@ -67,7 +67,7 @@ typedef __va_list va_list;
#define __va_size(type) \
(((sizeof(type) + sizeof(int) - 1) / sizeof(int)) * sizeof(int))
@@ -623,7 +650,7 @@
#else /* !__GNUCLIKE_BUILTIN_NEXT_ARG */
--- a/sys/i386/include/_types.h
+++ b/sys/i386/include/_types.h
-@@ -63,7 +63,7 @@
+@@ -63,7 +63,7 @@ typedef unsigned int __uint32_t;
typedef long long __int64_t;
/* LONGLONG */
typedef unsigned long long __uint64_t;
@@ -632,7 +659,7 @@
typedef int __attribute__((__mode__(__DI__))) __int64_t;
typedef unsigned int __attribute__((__mode__(__DI__))) __uint64_t;
#else
-@@ -126,7 +126,7 @@
+@@ -126,7 +126,7 @@ typedef __uint32_t __vm_size_t;
/*
* Unusual type definitions.
*/
@@ -652,7 +679,7 @@
#include <sys/_types.h>
-@@ -67,7 +67,7 @@
+@@ -67,7 +67,7 @@ typedef char *va_list;
#define __va_size(type) \
(((sizeof(type) + sizeof(int) - 1) / sizeof(int)) * sizeof(int))
@@ -674,7 +701,7 @@
__section("set_" #set) __used = &sym
--- a/sys/mips/include/endian.h
+++ b/sys/mips/include/endian.h
-@@ -68,7 +68,7 @@
+@@ -68,7 +68,7 @@ extern "C" {
#endif
#ifndef __ASSEMBLER__
@@ -685,7 +712,7 @@
#define __is_constant(x) 0
--- a/sys/mips/include/_types.h
+++ b/sys/mips/include/_types.h
-@@ -63,7 +63,7 @@
+@@ -63,7 +63,7 @@ typedef unsigned long __uint64_t;
typedef long long __int64_t;
/* LONGLONG */
typedef unsigned long long __uint64_t;
@@ -694,7 +721,7 @@
typedef int __attribute__((__mode__(__DI__))) __int64_t;
typedef unsigned int __attribute__((__mode__(__DI__))) __uint64_t;
#else
-@@ -154,11 +154,11 @@
+@@ -154,11 +154,11 @@ typedef __uint64_t __vm_pindex_t;
/*
* Unusual type definitions.
*/
More information about the Glibc-bsd-commits
mailing list