[Glibc-bsd-commits] r5289 - in trunk/kfreebsd-kernel-headers: debian debian/patches test
rmh at alioth.debian.org
rmh at alioth.debian.org
Thu Jan 2 18:43:09 UTC 2014
Author: rmh
Date: 2014-01-02 18:43:09 +0000 (Thu, 02 Jan 2014)
New Revision: 5289
Added:
trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff
trunk/kfreebsd-kernel-headers/test/assert_wchar_size.c
trunk/kfreebsd-kernel-headers/test/cpuset.c
Removed:
trunk/kfreebsd-kernel-headers/debian/patches/010_glibc.diff
trunk/kfreebsd-kernel-headers/debian/patches/030_pfvar.diff
trunk/kfreebsd-kernel-headers/debian/patches/033_pcpu.diff
trunk/kfreebsd-kernel-headers/debian/patches/035_devfs_int.diff
trunk/kfreebsd-kernel-headers/debian/patches/042_syscall_stubs.diff
trunk/kfreebsd-kernel-headers/debian/patches/bsd_visible.diff
trunk/kfreebsd-kernel-headers/debian/patches/endian_collision.diff
trunk/kfreebsd-kernel-headers/debian/patches/param_collision.diff
trunk/kfreebsd-kernel-headers/debian/patches/queue_collision.diff
trunk/kfreebsd-kernel-headers/debian/patches/remove_link_addr_and_link_ntoa.diff
trunk/kfreebsd-kernel-headers/debian/patches/sys_socket.diff
trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff
Modified:
trunk/kfreebsd-kernel-headers/debian/changelog
trunk/kfreebsd-kernel-headers/debian/control
trunk/kfreebsd-kernel-headers/debian/install
trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff
trunk/kfreebsd-kernel-headers/debian/patches/005_register_t.diff
trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff
trunk/kfreebsd-kernel-headers/debian/patches/011_wine.diff
trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff
trunk/kfreebsd-kernel-headers/debian/patches/019_exec_pagesize.diff
trunk/kfreebsd-kernel-headers/debian/patches/027_ktrace.diff
trunk/kfreebsd-kernel-headers/debian/patches/050_sigframe.diff
trunk/kfreebsd-kernel-headers/debian/patches/cpufunc.diff
trunk/kfreebsd-kernel-headers/debian/patches/series
trunk/kfreebsd-kernel-headers/debian/patches/signal_collision.diff
trunk/kfreebsd-kernel-headers/debian/rules
trunk/kfreebsd-kernel-headers/test/Makefile
Log:
* New upstream release.
- Refresh all patches.
- Update install list with new internal dependencies.
- Misc adjustments to sed rules to preserve buildability.
- Add new tests: assert_wchar_size.c and cpuset.c
Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog 2014-01-02 17:43:13 UTC (rev 5288)
+++ trunk/kfreebsd-kernel-headers/debian/changelog 2014-01-02 18:43:09 UTC (rev 5289)
@@ -1,3 +1,13 @@
+kfreebsd-kernel-headers (10.0~1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ - Refresh all patches.
+ - Update install list with new internal dependencies.
+ - Misc adjustments to sed rules to preserve buildability.
+ - Add new tests: assert_wchar_size.c and cpuset.c
+
+ -- Robert Millan <rmh at debian.org> Thu, 02 Jan 2014 13:50:33 +0100
+
kfreebsd-kernel-headers (9.2~6) unstable; urgency=low
* Rename MAXLOGNAME to __kernel_MAXLOGNAME to avoid collision with
Modified: trunk/kfreebsd-kernel-headers/debian/control
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/control 2014-01-02 17:43:13 UTC (rev 5288)
+++ trunk/kfreebsd-kernel-headers/debian/control 2014-01-02 18:43:09 UTC (rev 5289)
@@ -4,7 +4,7 @@
Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
Uploaders: Aurelien Jarno <aurel32 at debian.org>,
Robert Millan <rmh at debian.org>
-Build-Depends: debhelper (>= 7), quilt, kfreebsd-source-9.2,
+Build-Depends: debhelper (>= 7), quilt, kfreebsd-source-10.0,
Vcs-Browser: http://anonscm.debian.org/viewvc/glibc-bsd/trunk/kfreebsd-kernel-headers/
Vcs-Svn: svn://anonscm.debian.org/glibc-bsd/trunk/kfreebsd-kernel-headers/
Standards-Version: 3.9.4
Modified: trunk/kfreebsd-kernel-headers/debian/install
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/install 2014-01-02 17:43:13 UTC (rev 5288)
+++ trunk/kfreebsd-kernel-headers/debian/install 2014-01-02 18:43:09 UTC (rev 5289)
@@ -3,7 +3,6 @@
sys/cam/ata/*.h usr/include/cam/ata
sys/cam/scsi/*.h usr/include/cam/scsi
sys/contrib/altq/altq/*.h usr/include/altq
-sys/contrib/pf/net/*.h usr/include/net
sys/dev/acpica/*.h usr/include/dev/acpica
sys/dev/an/*.h usr/include/dev/an
sys/dev/bktr/ioctl_bt848.h usr/include/dev/bktr
@@ -28,17 +27,11 @@
sys/dev/vkbd/*.h usr/include/dev/vkbd
sys/dev/wi/*.h usr/include/dev/wi
sys/fs/cd9660/*.h usr/include/fs/cd9660
-sys/fs/coda/*.h usr/include/fs/coda
sys/fs/devfs/*.h usr/include/fs/devfs
sys/fs/fdescfs/*.h usr/include/fs/fdescfs
-sys/fs/fifofs/*.h usr/include/fs/fifofs
-sys/fs/hpfs/*.h usr/include/fs/hpfs
sys/fs/msdosfs/*.h usr/include/fs/msdosfs
sys/fs/nfs/*.h usr/include/fs/nfs
-sys/fs/ntfs/*.h usr/include/fs/ntfs
sys/fs/nullfs/*.h usr/include/fs/nullfs
-sys/fs/nwfs/*.h usr/include/fs/nwfs
-sys/fs/portalfs/*.h usr/include/fs/portalfs
sys/fs/procfs/*.h usr/include/fs/procfs
sys/fs/pseudofs/*.h usr/include/fs/pseudofs
sys/fs/smbfs/*.h usr/include/fs/smbfs
@@ -163,12 +156,12 @@
sys/netipx/spx_debug.h usr/include/netipx
sys/netipx/spx_timer.h usr/include/netipx
sys/netipx/spx_var.h usr/include/netipx
-sys/netncp/*.h usr/include/netncp
sys/netsmb/*.h usr/include/netsmb
sys/nfs/*.h usr/include/nfs
sys/nfsserver/*.h usr/include/nfsserver
sys/nfsclient/*.h usr/include/nfsclient
sys/opencrypto/*.h usr/include/opencrypto
+sys/sys/_bitset.h usr/include/sys
sys/sys/_bus_dma.h usr/include/sys
sys/sys/_callout.h usr/include/sys
sys/sys/_cpuset.h usr/include/sys
@@ -191,6 +184,7 @@
sys/sys/assym.h usr/include/sys
sys/sys/ata.h usr/include/sys
sys/sys/bio.h usr/include/sys
+sys/sys/bitset.h usr/include/sys
sys/sys/bitstring.h usr/include/sys
sys/sys/blist.h usr/include/sys
sys/sys/buf.h usr/include/sys
@@ -198,6 +192,7 @@
sys/sys/bus.h usr/include/sys
sys/sys/bus_dma.h usr/include/sys
sys/sys/callout.h usr/include/sys
+sys/sys/caprights.h usr/include/sys
sys/sys/cdio.h usr/include/sys
sys/sys/cdrio.h usr/include/sys
sys/sys/chio.h usr/include/sys
@@ -209,7 +204,6 @@
sys/sys/cpuset.h usr/include/sys
sys/sys/ctype.h usr/include/sys
sys/sys/dataacq.h usr/include/sys
-sys/sys/device_port.h usr/include/sys
sys/sys/devicestat.h usr/include/sys
sys/sys/disk.h usr/include/sys
sys/sys/disklabel.h usr/include/sys
Modified: trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff 2014-01-02 17:43:13 UTC (rev 5288)
+++ trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff 2014-01-02 18:43:09 UTC (rev 5289)
@@ -27,17 +27,6 @@
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_
-
-+#include <sys/types.h>
-+
- /* Environment information of floating point unit */
- struct env87 {
- long en_cw; /* control word (16bits) */
--- a/sys/amd64/include/pcb.h
+++ b/sys/amd64/include/pcb.h
@@ -40,6 +40,7 @@
@@ -118,9 +107,9 @@
/*
* 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 @@
-
+@@ -69,15 +73,9 @@
#define LLADDR(s) ((caddr_t)((s)->sdl_data + (s)->sdl_nlen))
+ #define LLINDEX(s) ((s)->sdl_index)
-#ifndef _KERNEL
-
@@ -172,82 +161,9 @@
struct dvd_layer {
u_int8_t book_type :4;
u_int8_t book_version :4;
---- a/sys/sys/extattr.h
-+++ b/sys/sys/extattr.h
-@@ -68,36 +68,36 @@
- struct ucred *cred, struct thread *td, accmode_t accmode);
-
- #else
--#include <sys/cdefs.h>
-+#include <features.h>
-
- struct iovec;
-
- __BEGIN_DECLS
--int extattrctl(const char *_path, int _cmd, const char *_filename,
-- int _attrnamespace, const char *_attrname);
--int extattr_delete_fd(int _fd, int _attrnamespace, const char *_attrname);
--int extattr_delete_file(const char *_path, int _attrnamespace,
-- const char *_attrname);
--int extattr_delete_link(const char *_path, int _attrnamespace,
-- const char *_attrname);
--ssize_t extattr_get_fd(int _fd, int _attrnamespace, const char *_attrname,
-- void *_data, size_t _nbytes);
--ssize_t extattr_get_file(const char *_path, int _attrnamespace,
-- const char *_attrname, void *_data, size_t _nbytes);
--ssize_t extattr_get_link(const char *_path, int _attrnamespace,
-- const char *_attrname, void *_data, size_t _nbytes);
--ssize_t extattr_list_fd(int _fd, int _attrnamespace, void *_data,
-- size_t _nbytes);
--ssize_t extattr_list_file(const char *_path, int _attrnamespace, void *_data,
-- size_t _nbytes);
--ssize_t extattr_list_link(const char *_path, int _attrnamespace, void *_data,
-- size_t _nbytes);
--int extattr_set_fd(int _fd, int _attrnamespace, const char *_attrname,
-- const void *_data, size_t _nbytes);
--int extattr_set_file(const char *_path, int _attrnamespace,
-- const char *_attrname, const void *_data, size_t _nbytes);
--int extattr_set_link(const char *_path, int _attrnamespace,
-- const char *_attrname, const void *_data, size_t _nbytes);
-+extern int extattrctl(const char *_path, int _cmd, const char *_filename,
-+ int _attrnamespace, const char *_attrname) __THROW;
-+extern int extattr_delete_fd(int _fd, int _attrnamespace, const char *_attrname) __THROW;
-+extern int extattr_delete_file(const char *_path, int _attrnamespace,
-+ const char *_attrname) __THROW;
-+extern int extattr_delete_link(const char *_path, int _attrnamespace,
-+ const char *_attrname) __THROW;
-+extern ssize_t extattr_get_fd(int _fd, int _attrnamespace, const char *_attrname,
-+ void *_data, size_t _nbytes) __THROW;
-+extern ssize_t extattr_get_file(const char *_path, int _attrnamespace,
-+ const char *_attrname, void *_data, size_t _nbytes) __THROW;
-+extern ssize_t extattr_get_link(const char *_path, int _attrnamespace,
-+ const char *_attrname, void *_data, size_t _nbytes) __THROW;
-+extern ssize_t extattr_list_fd(int _fd, int _attrnamespace, void *_data,
-+ size_t _nbytes) __THROW;
-+extern ssize_t extattr_list_file(const char *_path, int _attrnamespace, void *_data,
-+ size_t _nbytes) __THROW;
-+extern ssize_t extattr_list_link(const char *_path, int _attrnamespace, void *_data,
-+ size_t _nbytes) __THROW;
-+extern int extattr_set_fd(int _fd, int _attrnamespace, const char *_attrname,
-+ const void *_data, size_t _nbytes) __THROW;
-+extern int extattr_set_file(const char *_path, int _attrnamespace,
-+ const char *_attrname, const void *_data, size_t _nbytes) __THROW;
-+extern int extattr_set_link(const char *_path, int _attrnamespace,
-+ const char *_attrname, const void *_data, size_t _nbytes) __THROW;
- __END_DECLS
-
- #endif /* !_KERNEL */
--- a/sys/sys/filedesc.h
+++ b/sys/sys/filedesc.h
-@@ -33,6 +33,7 @@
- #ifndef _SYS_FILEDESC_H_
- #define _SYS_FILEDESC_H_
-
-+#include <sys/types.h>
- #include <sys/kglue/sys/queue.h>
- #include <sys/event.h>
- #include <sys/lock.h>
-@@ -45,7 +46,7 @@
+@@ -63,7 +63,7 @@
* This structure is used for the management of descriptors. It may be
* shared by multiple processes.
*/
@@ -255,7 +171,7 @@
+#define NDSLOTTYPE unsigned long
struct filedesc {
- struct file **fd_ofiles; /* file structures for open files */
+ struct filedescent *fd_ofiles; /* open files */
--- a/sys/sys/jail.h
+++ b/sys/sys/jail.h
@@ -39,6 +39,10 @@
@@ -290,7 +206,7 @@
--- a/sys/sys/linker.h
+++ b/sys/sys/linker.h
-@@ -189,6 +189,13 @@
+@@ -185,6 +185,13 @@
/* HWPMC helper */
void *linker_hwpmc_list_objects(void);
@@ -304,7 +220,7 @@
#endif /* _KERNEL */
/*
-@@ -336,14 +343,14 @@
+@@ -332,14 +339,14 @@
#include <sys/cdefs.h>
__BEGIN_DECLS
@@ -578,7 +494,7 @@
struct thread;
/*
-@@ -797,9 +896,15 @@
+@@ -692,9 +791,15 @@
#include <sys/cdefs.h>
__BEGIN_DECLS
@@ -597,34 +513,9 @@
__END_DECLS
#endif /* _KERNEL */
---- a/sys/sys/timepps.h
-+++ b/sys/sys/timepps.h
-@@ -15,6 +15,8 @@
- #ifndef _SYS_TIMEPPS_H_
- #define _SYS_TIMEPPS_H_
-
-+#include <stddef.h>
-+#include <sys/time.h>
- #include <sys/ioccom.h>
- #include <sys/kglue/sys/time.h>
-
--- a/sys/sys/timex.h
+++ b/sys/sys/timex.h
-@@ -95,11 +95,9 @@
- */
- #ifndef _SYS_TIMEX_H_
- #define _SYS_TIMEX_H_ 1
--#define NTP_API 4 /* NTP API version */
-
--#ifndef MSDOS /* Microsoft specific */
--#include <sys/syscall.h>
--#endif /* MSDOS */
-+#include <features.h>
-+#include <time.h>
-
- /*
- * The following defines establish the performance envelope of the
-@@ -176,7 +174,13 @@
+@@ -179,7 +179,13 @@
* Note: The time member is in microseconds if STA_NANO is zero and
* nanoseconds if not.
*/
@@ -639,7 +530,7 @@
struct timespec time; /* current time (ns) (ro) */
long maxerror; /* maximum error (us) (ro) */
long esterror; /* estimated error (us) (ro) */
-@@ -225,9 +229,12 @@
+@@ -228,9 +234,12 @@
#else /* !_KERNEL */
#include <sys/cdefs.h>
@@ -726,7 +617,7 @@
(enaddr)[0] = 0x33; \
(enaddr)[1] = 0x33; \
@@ -69,6 +67,7 @@
- (enaddr)[5] = ((unsigned char *)ip6addr)[15]; \
+ (enaddr)[5] = ((const unsigned char *)ip6addr)[15]; \
}
+__BEGIN_DECLS
@@ -745,9 +636,9 @@
unsigned char arp_tpa[4]; /* target protocol address */
};
#define arp_hrd ea_hdr.ar_hrd
-@@ -90,9 +89,8 @@
- #define arp_op ea_hdr.ar_op
+@@ -91,9 +90,8 @@
+ #ifndef BURN_BRIDGES /* Can be used by third party software. */
struct sockaddr_inarp {
- unsigned char sin_len;
- unsigned char sin_family;
@@ -757,7 +648,7 @@
struct in_addr sin_addr;
struct in_addr sin_srcaddr;
unsigned short sin_tos;
-@@ -105,9 +103,11 @@
+@@ -108,9 +106,11 @@
#define RTF_USETRAILERS RTF_PROTO1 /* use trailers */
#define RTF_ANNOUNCE RTF_PROTO2 /* announce new arp entry */
@@ -771,9 +662,9 @@
struct llentry;
struct ifaddr;
-@@ -118,5 +118,3 @@
- void arp_ifinit(struct ifnet *, struct ifaddr *);
+@@ -123,5 +123,3 @@
void arp_ifinit2(struct ifnet *, struct ifaddr *, unsigned char *);
+ void arp_ifscrub(struct ifnet *, uint32_t);
#endif
-
-#endif
Modified: trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff 2014-01-02 17:43:13 UTC (rev 5288)
+++ trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff 2014-01-02 18:43:09 UTC (rev 5289)
@@ -31,17 +31,6 @@
/*
* Prototypes and definitions for BSD/OS-compatible network interface
* media selection.
---- 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_
-
--#include <sys/stdint.h>
-+#include <stdint.h>
- #include <sys/endian.h>
-
- /*
--- a/misc/videodev.h
+++ b/misc/videodev.h
@@ -12,6 +12,7 @@
@@ -105,15 +94,15 @@
#ifdef _KERNEL
--- a/sys/sys/_mutex.h
+++ b/sys/sys/_mutex.h
-@@ -31,6 +31,8 @@
- #ifndef _SYS__MUTEX_H_
- #define _SYS__MUTEX_H_
+@@ -33,6 +33,8 @@
+ #include <machine/param.h>
+
+#include <stdint.h>
+
/*
* Sleep/spin mutex.
- */
+ *
--- a/sys/sys/bio.h
+++ b/sys/sys/bio.h
@@ -39,6 +39,7 @@
@@ -123,7 +112,7 @@
+#include <stdint.h>
/* bio_cmd */
- #define BIO_READ 0x01
+ #define BIO_READ 0x01 /* Read I/O data */
--- a/sys/sys/devicestat.h
+++ b/sys/sys/devicestat.h
@@ -33,6 +33,7 @@
@@ -160,7 +149,7 @@
/*
--- a/sys/sys/pcpu.h
+++ b/sys/sys/pcpu.h
-@@ -48,6 +48,8 @@
+@@ -52,6 +52,8 @@
#ifdef _KERNEL
Modified: trunk/kfreebsd-kernel-headers/debian/patches/005_register_t.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/005_register_t.diff 2014-01-02 17:43:13 UTC (rev 5288)
+++ trunk/kfreebsd-kernel-headers/debian/patches/005_register_t.diff 2014-01-02 18:43:09 UTC (rev 5289)
@@ -24,17 +24,6 @@
#ifndef _SYS_CDEFS_H
#error this file needs sys/cdefs.h as a prerequisite
#endif
---- a/sys/amd64/include/frame.h
-+++ b/sys/amd64/include/frame.h
-@@ -37,6 +37,8 @@
- #ifndef _MACHINE_FRAME_H_
- #define _MACHINE_FRAME_H_ 1
-
-+#include <sys/types.h>
-+
- /*
- * System stack frames.
- */
--- a/sys/amd64/include/intr_machdep.h
+++ b/sys/amd64/include/intr_machdep.h
@@ -29,6 +29,8 @@
@@ -88,17 +77,6 @@
#ifndef _SYS_CDEFS_H
#error this file needs sys/cdefs.h as a prerequisite
#endif
---- a/sys/amd64/include/reg.h
-+++ b/sys/amd64/include/reg.h
-@@ -37,6 +37,8 @@
- #ifndef _MACHINE_REG_H_
- #define _MACHINE_REG_H_
-
-+#include <sys/types.h>
-+
- #if defined(_KERNEL) && !defined(_STANDALONE)
- #include "opt_compat.h"
- #endif
--- a/sys/i386/include/apicvar.h
+++ b/sys/i386/include/apicvar.h
@@ -32,6 +32,8 @@
@@ -165,30 +143,20 @@
#include <machine/endian.h>
--- a/sys/mips/include/frame.h
+++ b/sys/mips/include/frame.h
-@@ -37,6 +37,8 @@
- #ifndef _MACHINE_FRAME_H_
- #define _MACHINE_FRAME_H_
+@@ -39,6 +39,8 @@
+ /* Note: This must also match regnum.h and regdef.h */
+
+#include <sys/types.h>
+
struct trapframe {
register_t zero;
register_t ast;
---- a/sys/mips/include/pcb.h
-+++ b/sys/mips/include/pcb.h
-@@ -42,6 +42,7 @@
- #ifndef _MACHINE_PCB_H_
- #define _MACHINE_PCB_H_
-
-+#include <sys/types.h>
- #include <machine/frame.h>
-
- /*
--- a/sys/mips/include/proc.h
+++ b/sys/mips/include/proc.h
-@@ -39,6 +39,8 @@
- #ifndef _MACHINE_PROC_H_
- #define _MACHINE_PROC_H_
+@@ -43,6 +43,8 @@
+ #include <machine/octeon_cop2.h>
+ #endif
+#include <sys/types.h>
+
@@ -197,9 +165,9 @@
*/
--- a/sys/mips/include/reg.h
+++ b/sys/mips/include/reg.h
-@@ -42,6 +42,8 @@
- #ifndef _MACHINE_REG_H_
- #define _MACHINE_REG_H_
+@@ -46,6 +46,8 @@
+ #include "opt_compat.h"
+ #endif
+#include <sys/types.h>
+
@@ -208,9 +176,9 @@
* must be visible to assembly code.
--- a/sys/mips/include/sigframe.h
+++ b/sys/mips/include/sigframe.h
-@@ -32,6 +32,8 @@
- #ifndef _MACHINE_SIGFRAME_H_
- #define _MACHINE_SIGFRAME_H_
+@@ -36,6 +36,8 @@
+ #include "opt_compat.h"
+ #endif
+#include <sys/types.h>
+
@@ -238,13 +206,13 @@
+
#ifndef _LOCORE
- typedef struct __mcontext {
+ #if defined(_KERNEL) && !defined(KLD_MODULE) && !defined(_STANDALONE)
--- a/sys/sys/ktrace.h
+++ b/sys/sys/ktrace.h
-@@ -33,6 +33,8 @@
- #ifndef _SYS_KTRACE_H_
- #define _SYS_KTRACE_H_
+@@ -35,6 +35,8 @@
+ #include <sys/caprights.h>
+
+#include <sys/types.h>
+
/*
@@ -270,13 +238,3 @@
struct rlimit;
struct sysent;
---- a/sys/sys/sysproto.h
-+++ b/sys/sys/sysproto.h
-@@ -14,6 +14,7 @@
- #include <sys/cpuset.h>
- #include <sys/_semaphore.h>
- #include <sys/ucontext.h>
-+#include <sys/types.h>
-
- #include <bsm/audit_kevents.h>
-
Modified: trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff 2014-01-02 17:43:13 UTC (rev 5288)
+++ trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff 2014-01-02 18:43:09 UTC (rev 5289)
@@ -21,7 +21,7 @@
/*
* Structures defining a network interface, providing a packet
* transport mechanism (ala level 0 of the PUP protocols).
-@@ -84,7 +87,7 @@
+@@ -85,7 +88,7 @@
#endif /* _KERNEL */
#include <sys/lock.h> /* XXX */
#include <sys/mutex.h> /* XXX */
@@ -30,7 +30,7 @@
#include <sys/sx.h> /* XXX */
#include <sys/event.h> /* XXX */
#include <sys/_task.h>
-@@ -775,8 +778,19 @@
+@@ -790,8 +793,19 @@
*/
struct ifaddr {
struct sockaddr *ifa_addr; /* address of interface */
@@ -77,7 +77,7 @@
* Overlay for ip header used by other protocols (tcp, udp).
--- a/sys/netinet6/in6_var.h
+++ b/sys/netinet6/in6_var.h
-@@ -70,6 +70,9 @@
+@@ -71,6 +71,9 @@
#include <sys/libkern.h>
#endif
Deleted: trunk/kfreebsd-kernel-headers/debian/patches/010_glibc.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/010_glibc.diff 2014-01-02 17:43:13 UTC (rev 5288)
+++ trunk/kfreebsd-kernel-headers/debian/patches/010_glibc.diff 2014-01-02 18:43:09 UTC (rev 5289)
@@ -1,22 +0,0 @@
----
- 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_
-
--#if !defined(_KERNEL) && !defined(_LIMITS_H_) && !defined(_SYS_PARAM_H_)
--#ifndef _SYS_CDEFS_H
--#error this file needs sys/cdefs.h as a prerequisite
--#endif
--#if defined(__GNUC__)
--#warning "No user-serviceable parts inside."
--#endif
--#endif
--
- /*
- * Do not add any new variables here. (See the comment at the end of
- * the file for why.)
Modified: trunk/kfreebsd-kernel-headers/debian/patches/011_wine.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/011_wine.diff 2014-01-02 17:43:13 UTC (rev 5288)
+++ trunk/kfreebsd-kernel-headers/debian/patches/011_wine.diff 2014-01-02 18:43:09 UTC (rev 5289)
@@ -1,131 +1,54 @@
--- a/sys/sys/elf32.h
+++ b/sys/sys/elf32.h
-@@ -30,16 +30,19 @@
- #define _SYS_ELF32_H_ 1
+@@ -35,6 +35,7 @@
+ #include <elf.h>
+ #endif
- #include <sys/elf_common.h>
-+#include <elf.h>
-
++#if 0
/*
* ELF definitions common to all 32-bit architectures.
*/
-
-+#if 0
- typedef uint32_t Elf32_Addr;
- typedef uint16_t Elf32_Half;
- typedef uint32_t Elf32_Off;
- typedef int32_t Elf32_Sword;
- typedef uint32_t Elf32_Word;
-+#endif
- typedef uint64_t Elf32_Lword;
-
- typedef Elf32_Word Elf32_Hashelt;
-@@ -48,6 +51,7 @@
- typedef Elf32_Word Elf32_Size;
- typedef Elf32_Sword Elf32_Ssize;
-
-+#if 0
- /*
- * ELF header.
+@@ -150,6 +151,8 @@
*/
-@@ -165,6 +169,8 @@
- #define ELF32_M_SIZE(info) ((unsigned char)(info))
- #define ELF32_M_INFO(sym, size) (((sym)<<8)+(unsigned char)(size))
+ typedef Elf_Note Elf32_Nhdr;
+#endif
+
/*
- * Hardware/Software capabilities entry
+ * Move entry
*/
-@@ -176,6 +182,7 @@
- } c_un;
- } Elf32_Cap;
+@@ -161,6 +164,7 @@
+ Elf32_Half m_stride; /* stride info */
+ } Elf32_Move;
+#if 0
/*
- * Symbol table entries.
- */
-@@ -234,12 +241,15 @@
- Elf32_Word vna_name;
- Elf32_Word vna_next;
- } Elf32_Vernaux;
-+#endif
-
- typedef Elf32_Half Elf32_Versym;
-
-+#if 0
- typedef struct {
- Elf32_Half si_boundto; /* direct bindings - symbol bound to */
- Elf32_Half si_flags; /* per symbol flags */
- } Elf32_Syminfo;
-+#endif
-
- #endif /* !_SYS_ELF32_H_ */
+ * The macros compose and decompose values for Move.r_info
+ *
--- a/sys/sys/elf64.h
+++ b/sys/sys/elf64.h
-@@ -30,19 +30,24 @@
- #define _SYS_ELF64_H_ 1
-
- #include <sys/elf_common.h>
-+#include <elf.h>
-
- /*
- * ELF definitions common to all 64-bit architectures.
- */
-
-+#if 0
- typedef uint64_t Elf64_Addr;
- typedef uint16_t Elf64_Half;
- typedef uint64_t Elf64_Off;
- typedef int32_t Elf64_Sword;
- typedef int64_t Elf64_Sxword;
- typedef uint32_t Elf64_Word;
-+#endif
- typedef uint64_t Elf64_Lword;
-+#if 0
+@@ -52,6 +52,7 @@
typedef uint64_t Elf64_Xword;
-+#endif
+ #endif
- /*
- * Types of dynamic symbol hash table bucket and chain elements.
-@@ -57,6 +62,7 @@
- typedef Elf64_Xword Elf64_Size;
- typedef Elf64_Sxword Elf64_Ssize;
-
+#if 0
/*
- * ELF header.
+ * Types of dynamic symbol hash table bucket and chain elements.
+ *
+@@ -166,6 +167,8 @@
*/
-@@ -172,6 +178,8 @@
- #define ELF64_M_SIZE(info) ((unsigned char)(info))
- #define ELF64_M_INFO(sym, size) (((sym)<<8)+(unsigned char)(size))
+ typedef Elf_Note Elf64_Nhdr;
+#endif
+
/*
- * Hardware/Software capabilities entry
+ * Move entry
*/
-@@ -183,6 +191,7 @@
- } c_un;
- } Elf64_Cap;
+@@ -183,6 +186,7 @@
+ #endif
+
+#if 0
/*
- * Symbol table entries.
+ * Hardware/Software capabilities entry
*/
-@@ -237,12 +246,15 @@
- Elf64_Word vna_name;
- Elf64_Word vna_next;
- } Elf64_Vernaux;
-+#endif
-
- typedef Elf64_Half Elf64_Versym;
-
-+#if 0
- typedef struct {
- Elf64_Half si_boundto; /* direct bindings - symbol bound to */
- Elf64_Half si_flags; /* per symbol flags */
- } Elf64_Syminfo;
-+#endif
-
- #endif /* !_SYS_ELF64_H_ */
Modified: trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff 2014-01-02 17:43:13 UTC (rev 5288)
+++ trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff 2014-01-02 18:43:09 UTC (rev 5289)
@@ -41,19 +41,6 @@
#ifndef _SUSECONDS_T_DECLARED
typedef __suseconds_t suseconds_t;
-@@ -41,12 +42,4 @@
- #define _TIME_T_DECLARED
- #endif
-
--/*
-- * Structure returned by gettimeofday(2) system call, and used in other calls.
-- */
--struct timeval {
-- time_t tv_sec; /* seconds */
-- suseconds_t tv_usec; /* and microseconds */
--};
--
- #endif /* !_SYS__TIMEVAL_H_ */
--- a/sys/sys/devicestat.h
+++ b/sys/sys/devicestat.h
@@ -33,6 +33,8 @@
@@ -74,5 +61,5 @@
-#include <sys/_timespec.h>
+#include <sys/time.h>
- #if __BSD_VISIBLE
- #define TIMEVAL_TO_TIMESPEC(tv, ts) \
+ #ifndef __FreeBSD__
+ #include <sys/kglue/sys/time.h>
Modified: trunk/kfreebsd-kernel-headers/debian/patches/019_exec_pagesize.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/019_exec_pagesize.diff 2014-01-02 17:43:13 UTC (rev 5288)
+++ trunk/kfreebsd-kernel-headers/debian/patches/019_exec_pagesize.diff 2014-01-02 18:43:09 UTC (rev 5289)
@@ -5,7 +5,7 @@
--- a/sys/amd64/include/param.h
+++ b/sys/amd64/include/param.h
-@@ -81,6 +81,10 @@
+@@ -85,6 +85,10 @@
*/
#define ALIGNED_POINTER(p, t) 1
@@ -18,7 +18,7 @@
* architecture. It should be used with appropriate caution.
--- a/sys/i386/include/param.h
+++ b/sys/i386/include/param.h
-@@ -85,6 +85,10 @@
+@@ -78,6 +78,10 @@
*/
#define ALIGNED_POINTER(p, t) 1
Modified: trunk/kfreebsd-kernel-headers/debian/patches/027_ktrace.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/027_ktrace.diff 2014-01-02 17:43:13 UTC (rev 5288)
+++ trunk/kfreebsd-kernel-headers/debian/patches/027_ktrace.diff 2014-01-02 18:43:09 UTC (rev 5289)
@@ -4,7 +4,7 @@
--- a/sys/sys/ktrace.h
+++ b/sys/sys/ktrace.h
-@@ -35,6 +35,17 @@
+@@ -37,6 +37,17 @@
#include <sys/types.h>
Deleted: trunk/kfreebsd-kernel-headers/debian/patches/030_pfvar.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/030_pfvar.diff 2014-01-02 17:43:13 UTC (rev 5288)
+++ trunk/kfreebsd-kernel-headers/debian/patches/030_pfvar.diff 2014-01-02 18:43:09 UTC (rev 5289)
@@ -1,30 +0,0 @@
----
- 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
-@@ -39,13 +39,14 @@
- #include <sys/tree.h>
- #if 1
- #include <sys/lock.h>
--#include <sys/sx.h>
- #else
- #include <sys/rwlock.h>
- #endif
-
-+#include <net/if.h>
- #include <net/radix.h>
- #include <net/route.h>
-+#ifdef _KERNEL
- #if 1
- #include <net/if_clone.h>
- #include <net/pf_mtag.h>
-@@ -53,6 +54,7 @@
- #else
- #include <netinet/ip_ipsp.h>
- #endif
-+#endif
-
- #if 1
- #include <netinet/in.h>
Deleted: trunk/kfreebsd-kernel-headers/debian/patches/033_pcpu.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/033_pcpu.diff 2014-01-02 17:43:13 UTC (rev 5288)
+++ trunk/kfreebsd-kernel-headers/debian/patches/033_pcpu.diff 2014-01-02 18:43:09 UTC (rev 5289)
@@ -1,24 +0,0 @@
----
- sys/sys/pcpu.h | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/sys/sys/pcpu.h
-+++ b/sys/sys/pcpu.h
-@@ -42,6 +42,8 @@
- #include <sys/vmmeter.h>
- #include <sys/resource.h>
- #include <machine/pcpu.h>
-+#include <sys/_types.h>
-+#include <stdint.h>
-
- #define DPCPU_SETNAME "set_pcpu"
- #define DPCPU_SYMPREFIX "pcpu_entry_"
-@@ -160,7 +162,7 @@
- struct thread *pc_fpcurthread; /* Fp state owner */
- struct thread *pc_deadthread; /* Zombie thread or NULL */
- struct pcb *pc_curpcb; /* Current pcb */
-- uint64_t pc_switchtime; /* cpu_ticks() at last csw */
-+ u_int64_t pc_switchtime; /* cpu_ticks() at last csw */
- int pc_switchticks; /* `ticks' at last csw */
- unsigned int pc_cpuid; /* This cpu number */
- STAILQ_ENTRY(pcpu) pc_allcpu;
Deleted: trunk/kfreebsd-kernel-headers/debian/patches/035_devfs_int.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/035_devfs_int.diff 2014-01-02 17:43:13 UTC (rev 5288)
+++ trunk/kfreebsd-kernel-headers/debian/patches/035_devfs_int.diff 2014-01-02 18:43:09 UTC (rev 5289)
@@ -1,16 +0,0 @@
----
- 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
-@@ -69,6 +69,9 @@
- LIST_HEAD(, cdev_privdata) cdp_fdpriv;
- };
-
-+#define member2struct(s, m, x) \
-+ ((struct s *)(void *)((char *)(x) - offsetof(struct s, m)))
-+
- #define cdev2priv(c) member2struct(cdev_priv, cdp_c, c)
-
- struct cdev *devfs_alloc(int);
Deleted: trunk/kfreebsd-kernel-headers/debian/patches/042_syscall_stubs.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/042_syscall_stubs.diff 2014-01-02 17:43:13 UTC (rev 5288)
+++ trunk/kfreebsd-kernel-headers/debian/patches/042_syscall_stubs.diff 2014-01-02 18:43:09 UTC (rev 5289)
@@ -1,38 +0,0 @@
---- a/sys/amd64/include/sysarch.h
-+++ b/sys/amd64/include/sysarch.h
-@@ -83,11 +83,11 @@
-
- #ifndef _KERNEL
- __BEGIN_DECLS
--int amd64_get_fsbase(void **);
--int amd64_get_gsbase(void **);
--int amd64_set_fsbase(void *);
--int amd64_set_gsbase(void *);
- int sysarch(int, void *);
-+static inline int amd64_get_fsbase(void **addr) { return sysarch(AMD64_GET_FSBASE, addr); }
-+static inline int amd64_get_gsbase(void **addr) { return sysarch(AMD64_GET_GSBASE, addr); }
-+static inline int amd64_set_fsbase(void *addr) { return sysarch(AMD64_SET_FSBASE, &addr); }
-+static inline int amd64_set_gsbase(void *addr) { return sysarch(AMD64_SET_GSBASE, &addr); }
- __END_DECLS
- #else
- struct thread;
---- a/sys/i386/include/sysarch.h
-+++ b/sys/i386/include/sysarch.h
-@@ -94,13 +94,13 @@
- int i386_get_ioperm(unsigned int, unsigned int *, int *);
- int i386_set_ioperm(unsigned int, unsigned int, int);
- int i386_vm86(int, void *);
--int i386_get_fsbase(void **);
--int i386_get_gsbase(void **);
--int i386_set_fsbase(void *);
--int i386_set_gsbase(void *);
- int i386_set_watch(int, unsigned int, int, int, struct dbreg *);
- int i386_clr_watch(int, struct dbreg *);
- int sysarch(int, void *);
-+static inline int i386_get_fsbase(void **addr) { return sysarch(I386_GET_FSBASE, addr); }
-+static inline int i386_get_gsbase(void **addr) { return sysarch(I386_GET_GSBASE, addr); }
-+static inline int i386_set_fsbase(void *addr) { return sysarch(I386_SET_FSBASE, &addr); }
-+static inline int i386_set_gsbase(void *addr) { return sysarch(I386_SET_GSBASE, &addr); }
- __END_DECLS
- #else
- struct thread;
Modified: trunk/kfreebsd-kernel-headers/debian/patches/050_sigframe.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/050_sigframe.diff 2014-01-02 17:43:13 UTC (rev 5288)
+++ trunk/kfreebsd-kernel-headers/debian/patches/050_sigframe.diff 2014-01-02 18:43:09 UTC (rev 5289)
@@ -4,27 +4,35 @@
in mean time, hack it ;-)
---- a/sys/amd64/include/sigframe.h
-+++ b/sys/amd64/include/sigframe.h
-@@ -36,7 +36,8 @@
- */
- struct sigframe {
+--- a/sys/i386/include/sigframe.h
++++ b/sys/i386/include/sigframe.h
+@@ -82,7 +82,8 @@
+ register_t sf_addr; /* undocumented 4th arg */
+
union {
- __siginfohandler_t *sf_action;
+ __sighandler_t *sf_action;
-+/* should be: __siginfohandler_t *sf_action; */
++/* should be __siginfohandler_t *sf_action; */
__sighandler_t *sf_handler;
} sf_ahu;
- ucontext_t sf_uc; /* = *sf_ucontext */
---- a/sys/i386/include/sigframe.h
-+++ b/sys/i386/include/sigframe.h
-@@ -105,7 +105,8 @@
+ struct ucontext4 sf_uc; /* = *sf_ucontext */
+--- a/sys/x86/include/sigframe.h
++++ b/sys/x86/include/sigframe.h
+@@ -50,7 +50,7 @@
register_t sf_addr; /* undocumented 4th arg */
union {
- __siginfohandler_t *sf_action;
-+ __sighandler_t *sf_action;
-+/* should be __siginfohandler_t *sf_action; */
++ __sighandler_t *sf_action;
__sighandler_t *sf_handler;
} sf_ahu;
ucontext_t sf_uc; /* = *sf_ucontext */
+@@ -61,7 +61,7 @@
+ #ifdef __amd64__
+ struct sigframe {
+ union {
+- __siginfohandler_t *sf_action;
++ __sighandler_t *sf_action;
+ __sighandler_t *sf_handler;
+ } sf_ahu;
+ ucontext_t sf_uc; /* = *sf_ucontext */
Deleted: trunk/kfreebsd-kernel-headers/debian/patches/bsd_visible.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/bsd_visible.diff 2014-01-02 17:43:13 UTC (rev 5288)
+++ trunk/kfreebsd-kernel-headers/debian/patches/bsd_visible.diff 2014-01-02 18:43:09 UTC (rev 5289)
@@ -1,42 +0,0 @@
---- a/sys/sys/time.h
-+++ b/sys/sys/time.h
-@@ -52,7 +52,7 @@
- #define DST_EET 5 /* Eastern European dst */
- #define DST_CAN 6 /* Canada */
-
--#if __BSD_VISIBLE
-+#if 1 /* used by sys/devicestat.h and others */
- struct bintime {
- time_t sec;
- uint64_t frac;
---- a/sys/sys/limits.h
-+++ b/sys/sys/limits.h
-@@ -34,7 +34,9 @@
-
- #include <sys/cdefs.h>
- #include <machine/_limits.h>
-+#include <limits.h>
-
-+#if 0
- #define CHAR_BIT __CHAR_BIT /* number of bits in a char */
-
- #define SCHAR_MAX __SCHAR_MAX /* max value for a signed char */
-@@ -71,15 +73,16 @@
- #if __POSIX_VISIBLE || __XSI_VISIBLE
- #define SSIZE_MAX __SSIZE_MAX /* max value for an ssize_t */
- #endif
-+#endif /* 0 */
-
--#if __POSIX_VISIBLE >= 200112 || __XSI_VISIBLE
-+#if _POSIX_C_SOURCE >= 200112
- #define SIZE_T_MAX __SIZE_T_MAX /* max value for a size_t */
-
- #define OFF_MAX __OFF_MAX /* max value for an off_t */
- #define OFF_MIN __OFF_MIN /* min value for an off_t */
- #endif
-
--#if __BSD_VISIBLE
-+#ifdef __USE_BSD
- #define GID_MAX UINT_MAX /* max value for a gid_t */
- #define UID_MAX UINT_MAX /* max value for a uid_t */
-
Modified: trunk/kfreebsd-kernel-headers/debian/patches/cpufunc.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/cpufunc.diff 2014-01-02 17:43:13 UTC (rev 5288)
+++ trunk/kfreebsd-kernel-headers/debian/patches/cpufunc.diff 2014-01-02 18:43:09 UTC (rev 5289)
@@ -29,17 +29,6 @@
#include <machine/cpuregs.h>
/*
---- a/sys/powerpc/include/cpufunc.h
-+++ b/sys/powerpc/include/cpufunc.h
-@@ -29,6 +29,8 @@
- #ifndef _MACHINE_CPUFUNC_H_
- #define _MACHINE_CPUFUNC_H_
-
-+#include <stdint.h>
-+
- /*
- * Required for user-space atomic.h includes
- */
--- a/sys/sparc64/include/cpufunc.h
+++ b/sys/sparc64/include/cpufunc.h
@@ -29,6 +29,7 @@
Deleted: trunk/kfreebsd-kernel-headers/debian/patches/endian_collision.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/endian_collision.diff 2014-01-02 17:43:13 UTC (rev 5288)
+++ trunk/kfreebsd-kernel-headers/debian/patches/endian_collision.diff 2014-01-02 18:43:09 UTC (rev 5289)
@@ -1,51 +0,0 @@
-
-bswapXX collides with glibc definitions, which uses __bswap_XX instead of
-__bswapXX.
-
---- a/sys/sys/endian.h
-+++ b/sys/sys/endian.h
-@@ -53,6 +53,10 @@
- #define _UINT64_T_DECLARED
- #endif
-
-+#if !defined(_KERNEL) && defined(__GLIBC__)
-+/* Avoid conflicting (but functionally equivalent) definitions below. */
-+#include <endian.h>
-+#else
- /*
- * General byte order swapping functions.
- */
-@@ -93,6 +97,7 @@
- #define le32toh(x) bswap32((x))
- #define le64toh(x) bswap64((x))
- #endif /* _BYTE_ORDER == _LITTLE_ENDIAN */
-+#endif
-
- /* Alignment-agnostic encode/decode bytestream to/from little/big endian. */
-
---- a/sys/amd64/include/endian.h
-+++ b/sys/amd64/include/endian.h
-@@ -60,7 +60,9 @@
- * Deprecated variants that don't have enough underscores to be useful in more
- * strict namespaces.
- */
--#if __BSD_VISIBLE
-+#if 1
-+#include <endian.h>
-+#else
- #define LITTLE_ENDIAN _LITTLE_ENDIAN
- #define BIG_ENDIAN _BIG_ENDIAN
- #define PDP_ENDIAN _PDP_ENDIAN
---- a/sys/i386/include/endian.h
-+++ b/sys/i386/include/endian.h
-@@ -60,7 +60,9 @@
- * Deprecated variants that don't have enough underscores to be useful in more
- * strict namespaces.
- */
--#if __BSD_VISIBLE
-+#if 1
-+#include <endian.h>
-+#else
- #define LITTLE_ENDIAN _LITTLE_ENDIAN
- #define BIG_ENDIAN _BIG_ENDIAN
- #define PDP_ENDIAN _PDP_ENDIAN
Deleted: trunk/kfreebsd-kernel-headers/debian/patches/param_collision.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/param_collision.diff 2014-01-02 17:43:13 UTC (rev 5288)
+++ trunk/kfreebsd-kernel-headers/debian/patches/param_collision.diff 2014-01-02 18:43:09 UTC (rev 5289)
@@ -1,80 +0,0 @@
---- a/sys/sys/param.h
-+++ b/sys/sys/param.h
-@@ -39,10 +39,7 @@
- #define _SYS_PARAM_H_
-
- #include <sys/_null.h>
--
--#define BSD 199506 /* System version (year & month). */
--#define BSD4_3 1
--#define BSD4_4 1
-+#include <sys/param.h>
-
- /*
- * __FreeBSD_kernel_version numbers are documented in the Porter's Handbook.
-@@ -95,11 +92,15 @@
- #include <sys/syslimits.h>
-
- #define MAXCOMLEN 19 /* max command name remembered */
-+#if 0
- #define MAXINTERP PATH_MAX /* max interpreter file name length */
-+#endif
- #define __kernel_MAXLOGNAME 17 /* max login name length (incl. NUL) */
- #define MAXUPRC CHILD_MAX /* max simultaneous processes */
- #define NCARGS ARG_MAX /* max bytes for an exec function */
-+#if 0
- #define NGROUPS (NGROUPS_MAX+1) /* max number groups */
-+#endif
- #define NOFILE OPEN_MAX /* max open files per process */
- #define NOGROUP 65535 /* marker for empty group set member */
- #define MAXHOSTNAMELEN 256 /* max hostname size */
-@@ -136,7 +137,6 @@
- #ifndef DEV_BSHIFT
- #define DEV_BSHIFT 9 /* log2(DEV_BSIZE) */
- #endif
--#define DEV_BSIZE (1<<DEV_BSHIFT)
-
- #ifndef BLKDEV_IOSIZE
- #define BLKDEV_IOSIZE PAGE_SIZE /* default block device I/O size */
-@@ -213,9 +213,11 @@
- #define PDROP 0x200 /* OR'd with pri to stop re-entry of interlock mutex */
- #define PBDRY 0x400 /* for PCATCH stop is done on the user boundary */
-
-+#if 0
- #define NZERO 0 /* default "nice" */
-
- #define NBBY 8 /* number of bits in a byte */
-+#endif
- #define NBPW sizeof(int) /* number of bytes per word (integer) */
-
- #define CMASK 022 /* default file mask: S_IWGRP|S_IWOTH */
-@@ -261,6 +263,7 @@
- #define MAXPATHLEN PATH_MAX
- #define MAXSYMLINKS 32
-
-+#if 0
- /* Bit map related macros. */
- #define setbit(a,i) (((unsigned char *)(a))[(i)/NBBY] |= 1<<((i)%NBBY))
- #define clrbit(a,i) (((unsigned char *)(a))[(i)/NBBY] &= ~(1<<((i)%NBBY)))
-@@ -268,6 +271,7 @@
- (((const unsigned char *)(a))[(i)/NBBY] & (1<<((i)%NBBY)))
- #define isclr(a,i) \
- ((((const unsigned char *)(a))[(i)/NBBY] & (1<<((i)%NBBY))) == 0)
-+#endif
-
- /* Macros for counting and rounding. */
- #ifndef howmany
-@@ -275,9 +279,13 @@
- #endif
- #define nitems(x) (sizeof((x)) / sizeof((x)[0]))
- #define rounddown(x, y) (((x)/(y))*(y))
-+#if 0
- #define roundup(x, y) ((((x)+((y)-1))/(y))*(y)) /* to any y */
-+#endif
- #define roundup2(x, y) (((x)+((y)-1))&(~((y)-1))) /* if y is powers of two */
-+#if 0
- #define powerof2(x) ((((x)-1)&(x))==0)
-+#endif
-
- /* Macros for min/max. */
- #define MIN(a,b) (((a)<(b))?(a):(b))
Deleted: trunk/kfreebsd-kernel-headers/debian/patches/queue_collision.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/queue_collision.diff 2014-01-02 17:43:13 UTC (rev 5288)
+++ trunk/kfreebsd-kernel-headers/debian/patches/queue_collision.diff 2014-01-02 18:43:09 UTC (rev 5289)
@@ -1,340 +0,0 @@
---- a/sys/sys/queue.h
-+++ b/sys/sys/queue.h
-@@ -30,9 +30,10 @@
- * $FreeBSD$
- */
-
--#ifndef _SYS_QUEUE_H_
--#define _SYS_QUEUE_H_
-+#ifndef _SYS_KERN_QUEUE_H_
-+#define _SYS_KERN_QUEUE_H_
-
-+#include <sys/queue.h>
- #include <sys/cdefs.h>
-
- /*
-@@ -164,10 +165,12 @@
-
- #define SLIST_FIRST(head) ((head)->slh_first)
-
-+#if !defined(__GLIBC__) || defined(_KERNEL)
- #define SLIST_FOREACH(var, head, field) \
- for ((var) = SLIST_FIRST((head)); \
- (var); \
- (var) = SLIST_NEXT((var), field))
-+#endif
-
- #define SLIST_FOREACH_FROM(var, head, field) \
- for ((var) = ((var) ? (var) : SLIST_FIRST((head))); \
-@@ -189,6 +192,7 @@
- ((var) = *(varp)) != NULL; \
- (varp) = &SLIST_NEXT((var), field))
-
-+#if !defined(__GLIBC__) || defined(_KERNEL)
- #define SLIST_INIT(head) do { \
- SLIST_FIRST((head)) = NULL; \
- } while (0)
-@@ -202,9 +206,11 @@
- SLIST_NEXT((elm), field) = SLIST_FIRST((head)); \
- SLIST_FIRST((head)) = (elm); \
- } while (0)
-+#endif
-
- #define SLIST_NEXT(elm, field) ((elm)->field.sle_next)
-
-+#if !defined(__GLIBC__) || defined(_KERNEL)
- #define SLIST_REMOVE(head, elm, type, field) do { \
- QMD_SAVELINK(oldnext, (elm)->field.sle_next); \
- if (SLIST_FIRST((head)) == (elm)) { \
-@@ -218,7 +224,9 @@
- } \
- TRASHIT(*oldnext); \
- } while (0)
-+#endif
-
-+#if !defined(__GLIBC__) || defined(_KERNEL)
- #define SLIST_REMOVE_AFTER(elm, field) do { \
- SLIST_NEXT(elm, field) = \
- SLIST_NEXT(SLIST_NEXT(elm, field), field); \
-@@ -227,6 +235,7 @@
- #define SLIST_REMOVE_HEAD(head, field) do { \
- SLIST_FIRST((head)) = SLIST_NEXT(SLIST_FIRST((head)), field); \
- } while (0)
-+#endif
-
- #define SLIST_SWAP(head1, head2, type) do { \
- struct type *swap_first = SLIST_FIRST(head1); \
-@@ -254,6 +263,7 @@
- /*
- * Singly-linked Tail queue functions.
- */
-+#if !defined(__GLIBC__) || defined(_KERNEL)
- #define STAILQ_CONCAT(head1, head2) do { \
- if (!STAILQ_EMPTY((head2))) { \
- *(head1)->stqh_last = (head2)->stqh_first; \
-@@ -261,36 +271,44 @@
- STAILQ_INIT((head2)); \
- } \
- } while (0)
-+#endif
-
- #define STAILQ_EMPTY(head) ((head)->stqh_first == NULL)
-
- #define STAILQ_FIRST(head) ((head)->stqh_first)
-
-+#if !defined(__GLIBC__) || defined(_KERNEL)
- #define STAILQ_FOREACH(var, head, field) \
- for((var) = STAILQ_FIRST((head)); \
- (var); \
- (var) = STAILQ_NEXT((var), field))
-+#endif
-
- #define STAILQ_FOREACH_FROM(var, head, field) \
- for ((var) = ((var) ? (var) : STAILQ_FIRST((head))); \
- (var); \
- (var) = STAILQ_NEXT((var), field))
-
-+#if !defined(__GLIBC__) || defined(_KERNEL)
- #define STAILQ_FOREACH_SAFE(var, head, field, tvar) \
- for ((var) = STAILQ_FIRST((head)); \
- (var) && ((tvar) = STAILQ_NEXT((var), field), 1); \
- (var) = (tvar))
-+#endif
-
- #define STAILQ_FOREACH_FROM_SAFE(var, head, field, tvar) \
- for ((var) = ((var) ? (var) : STAILQ_FIRST((head))); \
- (var) && ((tvar) = STAILQ_NEXT((var), field), 1); \
- (var) = (tvar))
-
-+#if !defined(__GLIBC__) || defined(_KERNEL)
- #define STAILQ_INIT(head) do { \
- STAILQ_FIRST((head)) = NULL; \
- (head)->stqh_last = &STAILQ_FIRST((head)); \
- } while (0)
-+#endif
-
-+#if !defined(__GLIBC__) || defined(_KERNEL)
- #define STAILQ_INSERT_AFTER(head, tqelm, elm, field) do { \
- if ((STAILQ_NEXT((elm), field) = STAILQ_NEXT((tqelm), field)) == NULL)\
- (head)->stqh_last = &STAILQ_NEXT((elm), field); \
-@@ -308,6 +326,7 @@
- *(head)->stqh_last = (elm); \
- (head)->stqh_last = &STAILQ_NEXT((elm), field); \
- } while (0)
-+#endif
-
- #define STAILQ_LAST(head, type, field) \
- (STAILQ_EMPTY((head)) ? NULL : \
-@@ -315,6 +334,7 @@
-
- #define STAILQ_NEXT(elm, field) ((elm)->field.stqe_next)
-
-+#if !defined(__GLIBC__) || defined(_KERNEL)
- #define STAILQ_REMOVE(head, elm, type, field) do { \
- QMD_SAVELINK(oldnext, (elm)->field.stqe_next); \
- if (STAILQ_FIRST((head)) == (elm)) { \
-@@ -328,6 +348,7 @@
- } \
- TRASHIT(*oldnext); \
- } while (0)
-+#endif
-
- #define STAILQ_REMOVE_AFTER(head, elm, field) do { \
- if ((STAILQ_NEXT(elm, field) = \
-@@ -335,11 +356,13 @@
- (head)->stqh_last = &STAILQ_NEXT((elm), field); \
- } while (0)
-
-+#if !defined(__GLIBC__) || defined(_KERNEL)
- #define STAILQ_REMOVE_HEAD(head, field) do { \
- if ((STAILQ_FIRST((head)) = \
- STAILQ_NEXT(STAILQ_FIRST((head)), field)) == NULL) \
- (head)->stqh_last = &STAILQ_FIRST((head)); \
- } while (0)
-+#endif
-
- #define STAILQ_SWAP(head1, head2, type) do { \
- struct type *swap_first = STAILQ_FIRST(head1); \
-@@ -405,30 +428,37 @@
-
- #define LIST_FIRST(head) ((head)->lh_first)
-
-+#if !defined(__GLIBC__) || defined(_KERNEL)
- #define LIST_FOREACH(var, head, field) \
- for ((var) = LIST_FIRST((head)); \
- (var); \
- (var) = LIST_NEXT((var), field))
-+#endif
-
- #define LIST_FOREACH_FROM(var, head, field) \
- for ((var) = ((var) ? (var) : LIST_FIRST((head))); \
- (var); \
- (var) = LIST_NEXT((var), field))
-
-+#if !defined(__GLIBC__) || defined(_KERNEL)
- #define LIST_FOREACH_SAFE(var, head, field, tvar) \
- for ((var) = LIST_FIRST((head)); \
- (var) && ((tvar) = LIST_NEXT((var), field), 1); \
- (var) = (tvar))
-+#endif
-
- #define LIST_FOREACH_FROM_SAFE(var, head, field, tvar) \
- for ((var) = ((var) ? (var) : LIST_FIRST((head))); \
- (var) && ((tvar) = LIST_NEXT((var), field), 1); \
- (var) = (tvar))
-
-+#if !defined(__GLIBC__) || defined(_KERNEL)
- #define LIST_INIT(head) do { \
- LIST_FIRST((head)) = NULL; \
- } while (0)
-+#endif
-
-+#if !defined(__GLIBC__) || defined(_KERNEL)
- #define LIST_INSERT_AFTER(listelm, elm, field) do { \
- QMD_LIST_CHECK_NEXT(listelm, field); \
- if ((LIST_NEXT((elm), field) = LIST_NEXT((listelm), field)) != NULL)\
-@@ -453,6 +483,7 @@
- LIST_FIRST((head)) = (elm); \
- (elm)->field.le_prev = &LIST_FIRST((head)); \
- } while (0)
-+#endif
-
- #define LIST_NEXT(elm, field) ((elm)->field.le_next)
-
-@@ -460,6 +491,7 @@
- ((elm)->field.le_prev == &LIST_FIRST((head)) ? NULL : \
- __containerof((elm)->field.le_prev, struct type, field.le_next))
-
-+#if !defined(__GLIBC__) || defined(_KERNEL)
- #define LIST_REMOVE(elm, field) do { \
- QMD_SAVELINK(oldnext, (elm)->field.le_next); \
- QMD_SAVELINK(oldprev, (elm)->field.le_prev); \
-@@ -472,6 +504,7 @@
- TRASHIT(*oldnext); \
- TRASHIT(*oldprev); \
- } while (0)
-+#endif
-
- #define LIST_SWAP(head1, head2, type, field) do { \
- struct type *swap_tmp = LIST_FIRST((head1)); \
-@@ -486,22 +519,26 @@
- /*
- * Tail queue declarations.
- */
-+#if !defined(__GLIBC__) || defined(_KERNEL)
- #define TAILQ_HEAD(name, type) \
- struct name { \
- struct type *tqh_first; /* first element */ \
- struct type **tqh_last; /* addr of last next element */ \
- TRACEBUF \
- }
-+#endif
-
- #define TAILQ_HEAD_INITIALIZER(head) \
- { NULL, &(head).tqh_first }
-
-+#if !defined(__GLIBC__) || defined(_KERNEL)
- #define TAILQ_ENTRY(type) \
- struct { \
- struct type *tqe_next; /* next element */ \
- struct type **tqe_prev; /* address of previous next element */ \
- TRACEBUF \
- }
-+#endif
-
- /*
- * Tail queue functions.
-@@ -537,6 +574,7 @@
- #define QMD_TAILQ_CHECK_PREV(elm, field)
- #endif /* (_KERNEL && INVARIANTS) */
-
-+#if !defined(__GLIBC__) || defined(_KERNEL)
- #define TAILQ_CONCAT(head1, head2, field) do { \
- if (!TAILQ_EMPTY(head2)) { \
- *(head1)->tqh_last = (head2)->tqh_first; \
-@@ -547,51 +585,61 @@
- QMD_TRACE_HEAD(head2); \
- } \
- } while (0)
-+#endif
-
- #define TAILQ_EMPTY(head) ((head)->tqh_first == NULL)
-
- #define TAILQ_FIRST(head) ((head)->tqh_first)
-
-+#if !defined(__GLIBC__) || defined(_KERNEL)
- #define TAILQ_FOREACH(var, head, field) \
- for ((var) = TAILQ_FIRST((head)); \
- (var); \
- (var) = TAILQ_NEXT((var), field))
-+#endif
-
- #define TAILQ_FOREACH_FROM(var, head, field) \
- for ((var) = ((var) ? (var) : TAILQ_FIRST((head))); \
- (var); \
- (var) = TAILQ_NEXT((var), field))
-
-+#if !defined(__GLIBC__) || defined(_KERNEL)
- #define TAILQ_FOREACH_SAFE(var, head, field, tvar) \
- for ((var) = TAILQ_FIRST((head)); \
- (var) && ((tvar) = TAILQ_NEXT((var), field), 1); \
- (var) = (tvar))
-+#endif
-
- #define TAILQ_FOREACH_FROM_SAFE(var, head, field, tvar) \
- for ((var) = ((var) ? (var) : TAILQ_FIRST((head))); \
- (var) && ((tvar) = TAILQ_NEXT((var), field), 1); \
- (var) = (tvar))
-
-+#if !defined(__GLIBC__) || defined(_KERNEL)
- #define TAILQ_FOREACH_REVERSE(var, head, headname, field) \
- for ((var) = TAILQ_LAST((head), headname); \
- (var); \
- (var) = TAILQ_PREV((var), headname, field))
-+#endif
-
- #define TAILQ_FOREACH_REVERSE_FROM(var, head, headname, field) \
- for ((var) = ((var) ? (var) : TAILQ_LAST((head), headname)); \
- (var); \
- (var) = TAILQ_PREV((var), headname, field))
-
-+#if !defined(__GLIBC__) || defined(_KERNEL)
- #define TAILQ_FOREACH_REVERSE_SAFE(var, head, headname, field, tvar) \
- for ((var) = TAILQ_LAST((head), headname); \
- (var) && ((tvar) = TAILQ_PREV((var), headname, field), 1); \
- (var) = (tvar))
-+#endif
-
- #define TAILQ_FOREACH_REVERSE_FROM_SAFE(var, head, headname, field, tvar) \
- for ((var) = ((var) ? (var) : TAILQ_LAST((head), headname)); \
- (var) && ((tvar) = TAILQ_PREV((var), headname, field), 1); \
- (var) = (tvar))
-
-+#if !defined(__GLIBC__) || defined(_KERNEL)
- #define TAILQ_INIT(head) do { \
- TAILQ_FIRST((head)) = NULL; \
- (head)->tqh_last = &TAILQ_FIRST((head)); \
-@@ -645,6 +693,7 @@
- QMD_TRACE_HEAD(head); \
- QMD_TRACE_ELEM(&(elm)->field); \
- } while (0)
-+#endif
-
- #define TAILQ_LAST(head, headname) \
- (*(((struct headname *)((head)->tqh_last))->tqh_last))
-@@ -654,6 +703,7 @@
- #define TAILQ_PREV(elm, headname, field) \
- (*(((struct headname *)((elm)->field.tqe_prev))->tqh_last))
-
-+#if !defined(__GLIBC__) || defined(_KERNEL)
- #define TAILQ_REMOVE(head, elm, field) do { \
- QMD_SAVELINK(oldnext, (elm)->field.tqe_next); \
- QMD_SAVELINK(oldprev, (elm)->field.tqe_prev); \
-@@ -671,6 +721,7 @@
- TRASHIT(*oldprev); \
- QMD_TRACE_ELEM(&(elm)->field); \
- } while (0)
-+#endif
-
- #define TAILQ_SWAP(head1, head2, type, field) do { \
- struct type *swap_first = (head1)->tqh_first; \
Deleted: trunk/kfreebsd-kernel-headers/debian/patches/remove_link_addr_and_link_ntoa.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/remove_link_addr_and_link_ntoa.diff 2014-01-02 17:43:13 UTC (rev 5288)
+++ trunk/kfreebsd-kernel-headers/debian/patches/remove_link_addr_and_link_ntoa.diff 2014-01-02 18:43:09 UTC (rev 5289)
@@ -1,14 +0,0 @@
-
-See #715320
-
---- a/sys/net/if_dl.h
-+++ b/sys/net/if_dl.h
-@@ -73,8 +73,6 @@
- #define LLADDR(s) ((caddr_t)((s)->sdl_data + (s)->sdl_nlen))
-
- __BEGIN_DECLS
--extern void link_addr (const char *, struct sockaddr_dl *);
--extern char *link_ntoa (const struct sockaddr_dl *);
- __END_DECLS
-
- #endif
Modified: trunk/kfreebsd-kernel-headers/debian/patches/series
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/series 2014-01-02 17:43:13 UTC (rev 5288)
+++ trunk/kfreebsd-kernel-headers/debian/patches/series 2014-01-02 18:43:09 UTC (rev 5289)
@@ -2,6 +2,8 @@
000_v4l.diff
# Patches that are in good shape for merging upstream
+queue_collision.diff
+type_collision.diff
# Other patches that might or might not be mergeable
000_bruno_haible.diff
@@ -12,7 +14,6 @@
007_kvm.diff
008_vm_vm_param_h.diff
009_inetutils.diff
-010_glibc.diff
011_wine.diff
cpufunc.diff
015_cam.diff
@@ -22,20 +23,9 @@
024_ioccom.diff
027_ktrace.diff
029_conf.diff
-030_pfvar.diff
031_ufs.diff
032_vnode.diff
-033_pcpu.diff
-035_devfs_int.diff
-042_syscall_stubs.diff
ctltype_quad.diff
-endian_collision.diff
-type_collision.diff
-param_collision.diff
-bsd_visible.diff
050_sigframe.diff
-remove_link_addr_and_link_ntoa.diff
-queue_collision.diff
-sys_socket.diff
signal_collision.diff
sys_kern_backward_compat.diff
Modified: trunk/kfreebsd-kernel-headers/debian/patches/signal_collision.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/signal_collision.diff 2014-01-02 17:43:13 UTC (rev 5288)
+++ trunk/kfreebsd-kernel-headers/debian/patches/signal_collision.diff 2014-01-02 18:43:09 UTC (rev 5289)
@@ -1,82 +1,3 @@
---- a/sys/sys/_sigset.h
-+++ b/sys/sys/_sigset.h
-@@ -48,9 +48,11 @@
- #define _SIG_BIT(sig) (1 << (_SIG_IDX(sig) & 31))
- #define _SIG_VALID(sig) ((sig) <= _SIG_MAXSIG && (sig) > 0)
-
-+#if 0
- typedef struct __sigset {
- __uint32_t __bits[_SIG_WORDS];
- } __sigset_t;
-+#endif
-
- #if defined(_KERNEL) && defined(COMPAT_43)
- typedef unsigned int osigset_t;
---- a/sys/amd64/include/signal.h
-+++ b/sys/amd64/include/signal.h
-@@ -41,11 +41,19 @@
- * Machine-dependent signal definitions
- */
-
-+#if 1
-+#define __need_sig_atomic_t
-+#include <signal.h>
-+#else
- typedef long sig_atomic_t;
-+#endif
-
- #if __BSD_VISIBLE
- #include <machine/trap.h> /* codes for SIGILL, SIGFPE */
-
-+#if 1
-+#include <signal.h>
-+#else
- /*
- * Information pushed on stack when a signal is delivered.
- * This is used by the kernel to restore state following
-@@ -104,6 +112,9 @@
-
- long sc_spare[4];
- };
-+
-+#endif
-+
- #endif /* __BSD_VISIBLE */
-
- #endif /* !_MACHINE_SIGNAL_H_ */
---- a/sys/i386/include/signal.h
-+++ b/sys/i386/include/signal.h
-@@ -40,7 +40,12 @@
- * Machine-dependent signal definitions
- */
-
-+#if 1
-+#define __need_sig_atomic_t
-+#include <signal.h>
-+#else
- typedef int sig_atomic_t;
-+#endif
-
- #if __BSD_VISIBLE
- #include <machine/trap.h> /* codes for SIGILL, SIGFPE */
-@@ -82,6 +87,9 @@
- };
- #endif
-
-+#if 1
-+#include <signal.h>
-+#else
- /*
- * The sequence of the fields/registers in struct sigcontext should match
- * those in mcontext_t and struct trapframe.
-@@ -132,6 +140,7 @@
- #define sc_pc sc_eip
- #define sc_ps sc_efl
- #define sc_eflags sc_efl
-+#endif
-
- #endif /* __BSD_VISIBLE */
-
--- a/sys/sys/signal.h
+++ b/sys/sys/signal.h
@@ -45,6 +45,13 @@
@@ -93,7 +14,7 @@
/*
* System defined signals.
*/
-@@ -440,4 +447,6 @@
+@@ -439,4 +446,6 @@
__sighandler_t *signal(int, __sighandler_t *);
__END_DECLS
Deleted: trunk/kfreebsd-kernel-headers/debian/patches/sys_socket.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/sys_socket.diff 2014-01-02 17:43:13 UTC (rev 5288)
+++ trunk/kfreebsd-kernel-headers/debian/patches/sys_socket.diff 2014-01-02 18:43:09 UTC (rev 5289)
@@ -1,54 +0,0 @@
---- a/sys/sys/socket.h
-+++ b/sys/sys/socket.h
-@@ -38,6 +38,8 @@
- #include <sys/_iovec.h>
- #include <machine/_align.h>
-
-+#if 0
-+
- /*
- * Definitions related to sockets: types, address families, options.
- */
-@@ -347,6 +349,10 @@
-
- #define PF_MAX AF_MAX
-
-+#endif /* __BSD_VISIBLE */
-+#endif /* 0 */
-+
-+#if __BSD_VISIBLE
- /*
- * Definitions for network related sysctl, CTL_NET.
- *
-@@ -421,6 +427,8 @@
- }
- #endif /* __BSD_VISIBLE */
-
-+#if 0
-+
- /*
- * Maximum queue length specifiable by listen.
- */
-@@ -681,5 +689,6 @@
-
- #endif
-
-+#endif
-
- #endif /* !_SYS_SOCKET_H_ */
---- a/sys/sys/_iovec.h
-+++ b/sys/sys/_iovec.h
-@@ -40,9 +40,13 @@
- #define _SIZE_T_DECLARED
- #endif
-
-+#if 1
-+#include <sys/uio.h>
-+#else
- struct iovec {
- void *iov_base; /* Base address. */
- size_t iov_len; /* Length. */
- };
-+#endif
-
- #endif /* !_SYS__IOVEC_H_ */
Deleted: trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff 2014-01-02 17:43:13 UTC (rev 5288)
+++ trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff 2014-01-02 18:43:09 UTC (rev 5289)
@@ -1,306 +0,0 @@
---- a/sys/i386/include/_types.h
-+++ b/sys/i386/include/_types.h
-@@ -68,7 +68,12 @@
- /*
- * Standard type definitions.
- */
-+#if defined(__GLIBC__) && !defined(_KERNEL)
-+/* This divergence is probably accidental, but it can't be fixed now. */
-+typedef __int32_t __clock_t;
-+#else
- typedef unsigned long __clock_t; /* clock()... */
-+#endif
- typedef __int32_t __critical_t;
- typedef long double __double_t;
- typedef long double __float_t;
-@@ -88,7 +93,11 @@
- typedef __int32_t __segsz_t; /* segment size (in pages) */
- typedef __uint32_t __this_is_a_temporary_kludge__size_t; /* sizeof() */
- typedef __int32_t __ssize_t; /* byte count or error */
-+#if defined(__GLIBC__) && !defined(_KERNEL)
-+typedef long int __time_t;
-+#else
- typedef __int32_t __time_t; /* time()... */
-+#endif
- typedef __uint32_t __uintfptr_t;
- typedef __uint64_t __uintmax_t;
- typedef __uint32_t __uintptr_t;
---- a/sys/sys/_types.h
-+++ b/sys/sys/_types.h
-@@ -40,10 +40,19 @@
- typedef __int32_t __clockid_t; /* clock_gettime()... */
- typedef __uint64_t __cap_rights_t; /* capability rights */
- typedef __uint32_t __fflags_t; /* file flags */
-+#if defined(__GLIBC__) && !defined(_KERNEL)
-+/* User-selectable types. Leave them to Glibc headers. */
-+#else
- typedef __uint64_t __fsblkcnt_t;
- typedef __uint64_t __fsfilcnt_t;
-+#endif
- typedef __uint32_t __gid_t;
-+#if defined(__GLIBC__) && !defined(_KERNEL)
-+/* This divergence is probably accidental, but it can't be fixed now. */
-+typedef __uint32_t __id_t;
-+#else
- typedef __int64_t __id_t; /* can hold a gid_t, pid_t, or uid_t */
-+#endif
- typedef __uint32_t __kernel_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) */
-@@ -59,8 +68,12 @@
- typedef __uint8_t __sa_family_t;
- typedef __uint32_t __socklen_t;
- typedef long __suseconds_t; /* microseconds (signed) */
-+#if defined(__GLIBC__) && !defined(_KERNEL)
-+typedef __int32_t __timer_t;
-+#else
- typedef struct __timer *__timer_t; /* timer_gettime()... */
--typedef struct __mq *__mqd_t; /* mq_open()... */
-+#endif
-+typedef struct __mq *__kernel_mqd_t; /* mq_open()... */
- typedef __uint32_t __uid_t;
- typedef unsigned int __useconds_t; /* microseconds (unsigned) */
- typedef int __cpuwhich_t; /* which parameter for cpuset. */
-@@ -98,9 +111,13 @@
- * mbstate_t is an opaque object to keep conversion state during multibyte
- * stream conversions.
- */
-+#if defined(__GLIBC__) && !defined(_KERNEL)
-+/* Defined in <wchar.h> */
-+#else
- typedef union {
- char __mbstate8[128];
- __int64_t _mbstateL; /* for alignment */
- } __mbstate_t;
-+#endif
-
- #endif /* !_SYS__TYPES_H_ */
---- a/sys/amd64/include/_types.h
-+++ b/sys/amd64/include/_types.h
-@@ -76,11 +76,19 @@
- typedef __int32_t __int_least32_t;
- typedef __int64_t __int_least64_t;
- typedef __int64_t __ptrdiff_t; /* ptr1 - ptr2 */
-+#if defined(__GLIBC__) && !defined(_KERNEL)
-+typedef int __register_t;
-+#else
- typedef __int64_t __register_t;
-+#endif
- typedef __int64_t __segsz_t; /* segment size (in pages) */
- typedef __uint64_t __this_is_a_temporary_kludge__size_t; /* sizeof() */
- typedef __int64_t __ssize_t; /* byte count or error */
-+#if defined(__GLIBC__) && !defined(_KERNEL)
-+typedef long int __time_t;
-+#else
- typedef __int64_t __time_t; /* time()... */
-+#endif
- typedef __uint64_t __uintfptr_t;
- typedef __uint64_t __uintmax_t;
- typedef __uint64_t __uintptr_t;
---- a/sys/ia64/include/_types.h
-+++ b/sys/ia64/include/_types.h
-@@ -74,7 +74,11 @@
- typedef __int32_t __int_least32_t;
- typedef __int64_t __int_least64_t;
- typedef __int64_t __ptrdiff_t; /* ptr1 - ptr2 */
-+#if defined(__GLIBC__) && !defined(_KERNEL)
-+typedef int __register_t;
-+#else
- typedef __int64_t __register_t;
-+#endif
- typedef __int64_t __segsz_t; /* segment size (in pages) */
- typedef __uint64_t __this_is_a_temporary_kludge__size_t; /* sizeof() */
- typedef __int64_t __ssize_t; /* byte count or error */
---- a/sys/mips/include/_types.h
-+++ b/sys/mips/include/_types.h
-@@ -94,7 +94,11 @@
- typedef __int32_t __int_least32_t;
- typedef __int64_t __int_least64_t;
- #if defined(__mips_n64) || defined(__mips_n32)
-+# if defined(__GLIBC__) && !defined(_KERNEL)
-+typedef int __register_t;
-+# else
- typedef __int64_t __register_t;
-+# endif
- typedef __int64_t f_register_t;
- #else
- typedef __int32_t __register_t;
---- a/sys/powerpc/include/_types.h
-+++ b/sys/powerpc/include/_types.h
-@@ -94,7 +94,11 @@
- typedef __int64_t __int_least64_t;
- #ifdef __LP64__
- typedef __int64_t __ptrdiff_t; /* ptr1 - ptr2 */
-+#if defined(__GLIBC__) && !defined(_KERNEL)
-+typedef int __register_t;
-+#else
- typedef __int64_t __register_t;
-+#endif
- typedef __int64_t __segsz_t; /* segment size (in pages) */
- typedef __uint64_t __this_is_a_temporary_kludge__size_t; /* sizeof() */
- typedef __int64_t __ssize_t; /* byte count or error */
---- a/sys/sparc64/include/_types.h
-+++ b/sys/sparc64/include/_types.h
-@@ -70,7 +70,11 @@
- typedef __int32_t __int_least32_t;
- typedef __int64_t __int_least64_t;
- typedef __int64_t __ptrdiff_t; /* ptr1 - ptr2 */
-+#if defined(__GLIBC__) && !defined(_KERNEL)
-+typedef int __register_t;
-+#else
- typedef __int64_t __register_t;
-+#endif
- typedef __int64_t __segsz_t; /* segment size (in pages) */
- typedef __uint64_t __this_is_a_temporary_kludge__size_t; /* sizeof() */
- typedef __int64_t __ssize_t; /* byte count or error */
---- a/sys/sys/types.h
-+++ b/sys/sys/types.h
-@@ -44,7 +44,15 @@
- #include <machine/endian.h>
- #include <sys/_types.h>
-
--#include <sys/_pthreadtypes.h>
-+/* Allow conflicting declarations in glibc <sys/types.h> to override us. */
-+#include <sys/types.h>
-+#define _CLOCK_T_DECLARED
-+#define _FSBLKCNT_T_DECLARED
-+#define _ID_T_DECLARED
-+#define _TIME_T_DECLARED
-+#define _TIMER_T_DECLARED
-+#define _MQD_T_DECLARED
-+#define _INO_T_DECLARED
-
- #if __BSD_VISIBLE
- typedef unsigned char u_char;
-@@ -182,8 +190,6 @@
- #define _PID_T_DECLARED
- #endif
-
--typedef __register_t register_t;
--
- #ifndef _RLIM_T_DECLARED
- typedef __rlim_t rlim_t; /* resource limit */
- #define _RLIM_T_DECLARED
-@@ -279,10 +285,8 @@
- * The following are all things that really shouldn't exist in this header,
- * since its purpose is to provide typedefs, not miscellaneous doodads.
- */
--#if __BSD_VISIBLE
--
- #include <sys/select.h>
--
-+#if 0
- /*
- * minor() gives a cookie instead of an index since we don't want to
- * change the meanings of bits 0-15 or waste time and space shifting
-@@ -297,7 +301,7 @@
- * <stdio.h> to give broken programs a better chance of working with
- * 64-bit off_t's.
- */
--#ifndef _KERNEL
-+#if 0
- __BEGIN_DECLS
- #ifndef _FTRUNCATE_DECLARED
- #define _FTRUNCATE_DECLARED
---- a/sys/sys/time.h
-+++ b/sys/sys/time.h
-@@ -36,11 +36,14 @@
- #include <sys/_timeval.h>
- #include <sys/kglue/sys/types.h>
- #include <sys/timespec.h>
-+#include <sys/time.h>
-
-+#if 0
- struct timezone {
- int tz_minuteswest; /* minutes west of Greenwich */
- int tz_dsttime; /* type of dst correction */
- };
-+#endif
- #define DST_NONE 0 /* not on dst */
- #define DST_USA 1 /* USA style dst */
- #define DST_AUST 2 /* Australian style dst */
-@@ -199,7 +202,7 @@
-
- #endif /* _KERNEL */
-
--#ifndef _KERNEL /* NetBSD/OpenBSD compatible interfaces */
-+#if 0
-
- #define timerclear(tvp) ((tvp)->tv_sec = (tvp)->tv_usec = 0)
- #define timerisset(tvp) ((tvp)->tv_sec || (tvp)->tv_usec)
-@@ -227,6 +230,7 @@
- } while (0)
- #endif
-
-+#if 0
- /*
- * Names of the interval timers, and structure
- * defining a timer setting.
-@@ -279,6 +283,8 @@
- #define CPUCLOCK_WHICH_TID 1
- #endif
-
-+#endif
-+
- #ifdef _KERNEL
-
- /*
-@@ -344,6 +350,7 @@
- #include <sys/cdefs.h>
- #include <sys/select.h>
-
-+#if 0
- __BEGIN_DECLS
- int setitimer(int, const struct itimerval *, struct itimerval *);
- int utimes(const char *, const struct timeval *);
-@@ -363,6 +370,7 @@
- #endif
-
- __END_DECLS
-+#endif
-
- #endif /* !_KERNEL */
-
---- a/sys/sys/timespec.h
-+++ b/sys/sys/timespec.h
-@@ -51,6 +51,7 @@
-
- #endif /* __BSD_VISIBLE */
-
-+#if 0
- /*
- * Structure defined by POSIX.1b to be like a itimerval, but with
- * timespecs. Used in the timer_*() system calls.
-@@ -59,5 +60,6 @@
- struct timespec it_interval;
- struct timespec it_value;
- };
-+#endif
-
- #endif /* _SYS_TIMESPEC_H_ */
---- a/sys/amd64/include/stdarg.h
-+++ b/sys/amd64/include/stdarg.h
-@@ -34,6 +34,10 @@
- #include <sys/cdefs.h>
- #include <sys/_types.h>
-
-+#include <stdarg.h>
-+#endif
-+#if 0
-+
- #ifndef _VA_LIST_DECLARED
- #define _VA_LIST_DECLARED
- typedef __va_list va_list;
---- a/sys/i386/include/stdarg.h
-+++ b/sys/i386/include/stdarg.h
-@@ -41,6 +41,10 @@
- #include <sys/cdefs.h>
- #include <sys/_types.h>
-
-+#include <stdarg.h>
-+#endif
-+#if 0
-+
- #ifndef _VA_LIST_DECLARED
- #define _VA_LIST_DECLARED
- typedef __va_list va_list;
Added: trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff (rev 0)
+++ trunk/kfreebsd-kernel-headers/debian/patches/type_collision.diff 2014-01-02 18:43:09 UTC (rev 5289)
@@ -0,0 +1,16 @@
+--- a/sys/x86/include/_types.h
++++ b/sys/x86/include/_types.h
+@@ -43,6 +43,13 @@
+ #error this file needs sys/cdefs.h as a prerequisite
+ #endif
+
++/* What "ifdef __FreeBSD__" taketh, "ifndef __FreeBSD__" giveth */
++#ifndef __FreeBSD__
++#define __need_time_t
++#define __need_clock_t
++#include <time.h>
++#endif
++
+ #define __NO_STRICT_ALIGNMENT
+
+ /*
Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules 2014-01-02 17:43:13 UTC (rev 5288)
+++ trunk/kfreebsd-kernel-headers/debian/rules 2014-01-02 18:43:09 UTC (rev 5289)
@@ -45,13 +45,7 @@
set -e ; \
find sys -type f | (while read i ; do \
sed -i $$i \
- -e 's/defined\s*(\s*__FreeBSD__\s*)/1/g' \
- -e 's/#\s*ifdef\s*__FreeBSD__\(\s\|$$\)/#if 1/g' \
- -e 's/#\s*ifndef\s*__FreeBSD__\(\s\|$$\)/#if 0/g' \
- -e 's/__FreeBSD__/$(major)/g' \
\
- -e "s/__FreeBSD_version/__FreeBSD_kernel_version/g" \
- \
-e 's/defined\s*(\s*__GNUCLIKE_[A-Z_]\+\s*)/defined(__GNUC__)/g' \
-e 's/#\s*ifdef\s*__GNUCLIKE_[A-Z_]\+\(\s\|$$\)/#if defined(__GNUC__)/g' \
-e 's/#\s*ifndef\s*__GNUCLIKE_[A-Z_]\+\(\s\|$$\)/#if !defined(__GNUC__)/g' \
@@ -85,10 +79,21 @@
\
-e 's/\(\s\|^\|(\)\(__\)\?ino_t\(\s\|)\|;\)/\1__kernel_ino_t\3/g' \
-e 's/\(\s\|^\|(\)\(__\)\?MAXLOGNAME\(\s\|)\|;\)/\1__kernel_MAXLOGNAME\3/g' \
+ -e 's/\(\s\|^\|(\)\(__\)\?WCHAR_MAX\(\s\|)\|;\)/\1__kernel_WCHAR_MAX\3/g' \
+ -e 's/\(\s\|^\|(\)\(__\)\?WCHAR_MIN\(\s\|)\|;\)/\1__kernel_WCHAR_MIN\3/g' \
; done)
echo "#include <sys/kern/param.h>" > misc/osreldate.h
echo "#include <stdint.h>" > misc/sys/stdint.h
+ # Revert the kglue redirection when mistakenly applied to headers that want to
+ # include the GNU version (otherwise they'll just be including themselves!)
+ sed -e 's/#\s*include\s\+<sys\/kglue\/sys\/types\.h>\s*/#include <sys\/types.h>/g' -i sys/sys/types.h
+ sed -e 's/#\s*include\s\+<sys\/kglue\/sys\/time\.h>\s*/#include <sys\/time.h>/g' -i sys/sys/time.h
+ sed -e 's/#\s*include\s\+<sys\/kglue\/sys\/param\.h>\s*/#include <sys\/param.h>/g' -i sys/sys/param.h
+ sed -e 's/#\s*include\s\+<sys\/kglue\/sys\/signal\.h>\s*/#include <sys\/signal.h>/g' -i sys/sys/signal.h
+ sed -e 's/#\s*include\s\+<sys\/kglue\/sys\/queue\.h>\s*/#include <sys\/queue.h>/g' -i sys/sys/queue.h
+ sed -e 's/#\s*include\s\+<sys\/kglue\/netinet\/if_ether\.h>\s*/#include <netinet\/if_ether.h>/g' -i sys/netinet/if_ether.h
+
QUILT_PATCHES=$(CURDIR)/debian/patches quilt push -a || test $$? = 2
touch $@
Modified: trunk/kfreebsd-kernel-headers/test/Makefile
===================================================================
--- trunk/kfreebsd-kernel-headers/test/Makefile 2014-01-02 17:43:13 UTC (rev 5288)
+++ trunk/kfreebsd-kernel-headers/test/Makefile 2014-01-02 18:43:09 UTC (rev 5289)
@@ -1,5 +1,6 @@
TESTS = \
assert_correct_bsize.o \
+ assert_wchar_size.o \
endian_collision.o \
socket_collision.o \
signal_collision.o \
@@ -14,6 +15,7 @@
\
bus.o \
cpufunc.o \
+ cpuset.o \
devicestat.o \
in_pcb.o \
ino_t.o \
Added: trunk/kfreebsd-kernel-headers/test/assert_wchar_size.c
===================================================================
--- trunk/kfreebsd-kernel-headers/test/assert_wchar_size.c (rev 0)
+++ trunk/kfreebsd-kernel-headers/test/assert_wchar_size.c 2014-01-02 18:43:09 UTC (rev 5289)
@@ -0,0 +1,9 @@
+#include <sys/cdefs.h>
+#include <machine/_limits.h>
+#include <machine/_types.h>
+#include <wchar.h>
+
+#include "assert.h"
+
+COMPILE_TIME_ASSERT(WCHAR_MAX, WCHAR_MAX == __kernel_WCHAR_MAX);
+COMPILE_TIME_ASSERT(WCHAR_MIN, WCHAR_MIN == __kernel_WCHAR_MIN);
Added: trunk/kfreebsd-kernel-headers/test/cpuset.c
===================================================================
--- trunk/kfreebsd-kernel-headers/test/cpuset.c (rev 0)
+++ trunk/kfreebsd-kernel-headers/test/cpuset.c 2014-01-02 18:43:09 UTC (rev 5289)
@@ -0,0 +1,2 @@
+#include <sys/param.h>
+#include <sys/cpuset.h>
More information about the Glibc-bsd-commits
mailing list