[Glibc-bsd-commits] r3892 - trunk/kfreebsd-kernel-headers/debian/patches
Robert Millan
rmh at alioth.debian.org
Wed Nov 23 19:14:53 UTC 2011
Author: rmh
Date: 2011-11-23 19:14:53 +0000 (Wed, 23 Nov 2011)
New Revision: 3892
Modified:
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/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/021_machine__types.diff
trunk/kfreebsd-kernel-headers/debian/patches/023_packed.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/029_conf.diff
trunk/kfreebsd-kernel-headers/debian/patches/031_ufs.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/038_gnuclike.diff
trunk/kfreebsd-kernel-headers/debian/patches/040_internal_types.patch
trunk/kfreebsd-kernel-headers/debian/patches/series
Log:
Move all "missing stdint.h" fixes to a single patch.
Modified: trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff 2011-11-23 18:19:09 UTC (rev 3891)
+++ trunk/kfreebsd-kernel-headers/debian/patches/004_stdint_h.diff 2011-11-23 19:14:53 UTC (rev 3892)
@@ -91,3 +91,131 @@
#include <sys/time.h>
#include <sys/types.h>
#include <sys/ioctl.h>
+--- a/sys/cam/scsi/scsi_all.h
++++ b/sys/cam/scsi/scsi_all.h
+@@ -25,6 +25,7 @@
+ #define _SCSI_SCSI_ALL_H 1
+
+ #include <sys/cdefs.h>
++#include <stdint.h>
+
+ #ifdef _KERNEL
+ /*
+--- a/sys/dev/acpica/acpiio.h
++++ b/sys/dev/acpica/acpiio.h
+@@ -30,6 +30,8 @@
+ #ifndef _ACPIIO_H_
+ #define _ACPIIO_H_
+
++#include <stdint.h>
++
+ /*
+ * Core ACPI subsystem ioctls
+ */
+--- a/sys/dev/ciss/cissio.h
++++ b/sys/dev/ciss/cissio.h
+@@ -35,6 +35,7 @@
+ *
+ */
+
++#include <stdint.h>
+ #include <sys/ioccom.h>
+
+ #pragma pack(1)
+--- a/sys/i386/include/cpufunc.h
++++ b/sys/i386/include/cpufunc.h
+@@ -38,6 +38,8 @@
+ #ifndef _MACHINE_CPUFUNC_H_
+ #define _MACHINE_CPUFUNC_H_
+
++#include <stdint.h>
++
+ #ifndef _SYS_CDEFS_H_
+ #error this file needs sys/cdefs.h as a prerequisite
+ #endif
+--- a/sys/netinet/tcp_var.h
++++ b/sys/netinet/tcp_var.h
+@@ -33,6 +33,7 @@
+ #ifndef _NETINET_TCP_VAR_H_
+ #define _NETINET_TCP_VAR_H_
+
++#include <stdint.h>
+ #include <netinet/tcp.h>
+
+ #ifdef _KERNEL
+--- a/sys/sys/_mutex.h
++++ b/sys/sys/_mutex.h
+@@ -31,6 +31,8 @@
+ #ifndef _SYS__MUTEX_H_
+ #define _SYS__MUTEX_H_
+
++#include <stdint.h>
++
+ /*
+ * Sleep/spin mutex.
+ */
+--- a/sys/sys/bio.h
++++ b/sys/sys/bio.h
+@@ -39,6 +39,7 @@
+ #define _SYS_BIO_H_
+
+ #include <sys/queue.h>
++#include <stdint.h>
+
+ /* bio_cmd */
+ #define BIO_READ 0x01
+--- a/sys/sys/devicestat.h
++++ b/sys/sys/devicestat.h
+@@ -33,6 +33,7 @@
+
+ #include <sys/queue.h>
+ #include <sys/time.h>
++#include <stdint.h>
+
+ /*
+ * XXX: Should really be SPECNAMELEN
+--- 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
+
++#include <stdint.h>
++
+ /*
+ * ELF definitions that are independent of architecture or word size.
+ */
+@@ -43,9 +45,9 @@
+ */
+
+ typedef struct {
+- u_int32_t n_namesz; /* Length of name. */
+- u_int32_t n_descsz; /* Length of descriptor. */
+- u_int32_t n_type; /* Type of this note. */
++ uint32_t n_namesz; /* Length of name. */
++ uint32_t n_descsz; /* Length of descriptor. */
++ uint32_t n_type; /* Type of this note. */
+ } Elf_Note;
+
+ /*
+--- a/sys/sys/event.h
++++ b/sys/sys/event.h
+@@ -30,7 +30,6 @@
+ #define _SYS_EVENT_H_
+
+ #include <sys/queue.h>
+-
+ #include <stdint.h>
+
+ #define EVFILT_READ (-1)
+--- a/sys/sys/pcpu.h
++++ b/sys/sys/pcpu.h
+@@ -42,6 +42,8 @@
+ #include <sys/resource.h>
+ #include <machine/pcpu.h>
+
++#include <stdint.h>
++
+ /*
+ * Define a set for pcpu data.
+ */
Modified: trunk/kfreebsd-kernel-headers/debian/patches/005_register_t.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/005_register_t.diff 2011-11-23 18:19:09 UTC (rev 3891)
+++ trunk/kfreebsd-kernel-headers/debian/patches/005_register_t.diff 2011-11-23 19:14:53 UTC (rev 3892)
@@ -112,10 +112,10 @@
*/
--- a/sys/i386/include/cpufunc.h
+++ b/sys/i386/include/cpufunc.h
-@@ -38,6 +38,8 @@
- #ifndef _MACHINE_CPUFUNC_H_
- #define _MACHINE_CPUFUNC_H_
+@@ -40,6 +40,8 @@
+ #include <stdint.h>
+
+#include <sys/types.h>
+
#ifndef _SYS_CDEFS_H_
Modified: trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff 2011-11-23 18:19:09 UTC (rev 3891)
+++ trunk/kfreebsd-kernel-headers/debian/patches/009_inetutils.diff 2011-11-23 19:14:53 UTC (rev 3892)
@@ -54,7 +54,7 @@
/*
* Structures defining a network interface, providing a packet
* transport mechanism (ala level 0 of the PUP protocols).
-@@ -84,7 +87,7 @@ struct vnet;
+@@ -84,7 +87,7 @@
#endif /* _KERNEL */
#include <sys/lock.h> /* XXX */
#include <sys/mutex.h> /* XXX */
@@ -63,7 +63,7 @@
#include <sys/sx.h> /* XXX */
#include <sys/event.h> /* XXX */
#include <sys/_task.h>
-@@ -710,8 +713,19 @@ drbr_inuse(struct ifnet *ifp, struct buf
+@@ -710,8 +713,19 @@
*/
struct ifaddr {
struct sockaddr *ifa_addr; /* address of interface */
@@ -131,7 +131,7 @@
typedef u_int32_t Fnv32_t;
typedef u_int64_t Fnv64_t;
-@@ -58,7 +60,7 @@ static __inline Fnv64_t
+@@ -58,7 +60,7 @@
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/011_wine.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/011_wine.diff 2011-11-23 18:19:09 UTC (rev 3891)
+++ trunk/kfreebsd-kernel-headers/debian/patches/011_wine.diff 2011-11-23 19:14:53 UTC (rev 3892)
@@ -16,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 @@ struct soft_segment_descriptor {
+@@ -156,7 +156,7 @@
*/
struct region_descriptor {
unsigned rd_limit:16; /* segment extent */
@@ -42,7 +42,7 @@
typedef uint64_t Elf32_Lword;
typedef Elf32_Word Elf32_Hashelt;
-@@ -48,198 +46,4 @@ typedef Elf32_Word Elf32_Hashelt;
+@@ -48,198 +46,4 @@
typedef Elf32_Word Elf32_Size;
typedef Elf32_Sword Elf32_Ssize;
@@ -261,7 +261,7 @@
/*
* Types of dynamic symbol hash table bucket and chain elements.
-@@ -57,192 +53,4 @@ typedef Elf64_Word Elf64_Hashelt;
+@@ -57,192 +53,4 @@
typedef Elf64_Xword Elf64_Size;
typedef Elf64_Sxword Elf64_Ssize;
@@ -454,27 +454,3 @@
-} Elf64_Syminfo;
-
#endif /* !_SYS_ELF64_H_ */
---- 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
-
-+#include <stdint.h>
-+
- /*
- * ELF definitions that are independent of architecture or word size.
- */
-@@ -43,9 +45,9 @@
- */
-
- typedef struct {
-- u_int32_t n_namesz; /* Length of name. */
-- u_int32_t n_descsz; /* Length of descriptor. */
-- u_int32_t n_type; /* Type of this note. */
-+ uint32_t n_namesz; /* Length of name. */
-+ uint32_t n_descsz; /* Length of descriptor. */
-+ uint32_t n_type; /* Type of this note. */
- } Elf_Note;
-
- /*
Modified: trunk/kfreebsd-kernel-headers/debian/patches/012_strace.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/012_strace.diff 2011-11-23 18:19:09 UTC (rev 3891)
+++ trunk/kfreebsd-kernel-headers/debian/patches/012_strace.diff 2011-11-23 19:14:53 UTC (rev 3892)
@@ -5,7 +5,7 @@
--- a/sys/i386/include/npx.h
+++ b/sys/i386/include/npx.h
-@@ -111,7 +111,7 @@ struct savexmm {
+@@ -111,7 +111,7 @@
} sv_fp[8];
struct xmmacc sv_xmm[8];
u_char sv_pad[224];
@@ -16,7 +16,7 @@
struct save87 sv_87;
--- a/sys/amd64/include/fpu.h
+++ b/sys/amd64/include/fpu.h
-@@ -71,7 +71,7 @@ struct savefpu {
+@@ -71,7 +71,7 @@
} sv_fp[8];
struct xmmacc sv_xmm[16];
u_char sv_pad[96];
Modified: trunk/kfreebsd-kernel-headers/debian/patches/013_mips.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/013_mips.diff 2011-11-23 18:19:09 UTC (rev 3891)
+++ trunk/kfreebsd-kernel-headers/debian/patches/013_mips.diff 2011-11-23 19:14:53 UTC (rev 3892)
@@ -5,10 +5,10 @@
--- 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 @@
+ #include <sys/types.h>
+
+#include <machine/_types.h> /* f_register_t */
+
struct trapframe {
@@ -16,10 +16,10 @@
register_t ast;
--- a/sys/mips/include/reg.h
+++ b/sys/mips/include/reg.h
-@@ -42,6 +42,8 @@
- #ifndef _MACHINE_REG_H_
- #define _MACHINE_REG_H_
+@@ -44,6 +44,8 @@
+ #include <sys/types.h>
+
+#include <machine/_types.h> /* f_register_t */
+
/*
Modified: trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff 2011-11-23 18:19:09 UTC (rev 3891)
+++ trunk/kfreebsd-kernel-headers/debian/patches/014_misc.diff 2011-11-23 19:14:53 UTC (rev 3892)
@@ -6,7 +6,7 @@
--- a/sys/dev/usb/usb.h
+++ b/sys/dev/usb/usb.h
-@@ -146,7 +146,7 @@ struct usb_device_request {
+@@ -146,7 +146,7 @@
uWord wValue;
uWord wIndex;
uWord wLength;
@@ -15,7 +15,7 @@
typedef struct usb_device_request usb_device_request_t;
#define UT_WRITE 0x00
-@@ -270,7 +270,7 @@ struct usb_descriptor {
+@@ -270,7 +270,7 @@
uByte bLength;
uByte bDescriptorType;
uByte bDescriptorSubtype;
@@ -24,7 +24,7 @@
typedef struct usb_descriptor usb_descriptor_t;
struct usb_device_descriptor {
-@@ -293,7 +293,7 @@ struct usb_device_descriptor {
+@@ -293,7 +293,7 @@
uByte iProduct;
uByte iSerialNumber;
uByte bNumConfigurations;
@@ -33,7 +33,7 @@
typedef struct usb_device_descriptor usb_device_descriptor_t;
/* Binary Device Object Store (BOS) */
-@@ -302,7 +302,7 @@ struct usb_bos_descriptor {
+@@ -302,7 +302,7 @@
uByte bDescriptorType;
uWord wTotalLength;
uByte bNumDeviceCaps;
@@ -42,7 +42,7 @@
typedef struct usb_bos_descriptor usb_bos_descriptor_t;
/* Binary Device Object Store Capability */
-@@ -316,7 +316,7 @@ struct usb_bos_cap_descriptor {
+@@ -316,7 +316,7 @@
#define USB_DEVCAP_SUPER_SPEED 0x03
#define USB_DEVCAP_CONTAINER_ID 0x04
/* data ... */
@@ -51,7 +51,7 @@
typedef struct usb_bos_cap_descriptor usb_bos_cap_descriptor_t;
struct usb_devcap_usb2ext_descriptor {
-@@ -325,7 +325,7 @@ struct usb_devcap_usb2ext_descriptor {
+@@ -325,7 +325,7 @@
uByte bDevCapabilityType;
uByte bmAttributes;
#define USB_V2EXT_LPM 0x02
@@ -60,7 +60,7 @@
typedef struct usb_devcap_usb2ext_descriptor usb_devcap_usb2ext_descriptor_t;
struct usb_devcap_ss_descriptor {
-@@ -337,7 +337,7 @@ struct usb_devcap_ss_descriptor {
+@@ -337,7 +337,7 @@
uByte bFunctionalitySupport;
uByte bU1DevExitLat;
uByte bU2DevExitLat;
@@ -69,7 +69,7 @@
typedef struct usb_devcap_ss_descriptor usb_devcap_ss_descriptor_t;
struct usb_devcap_container_id_descriptor {
-@@ -346,7 +346,7 @@ struct usb_devcap_container_id_descripto
+@@ -346,7 +346,7 @@
uByte bDevCapabilityType;
uByte bReserved;
uByte bContainerID;
@@ -78,7 +78,7 @@
typedef struct usb_devcap_container_id_descriptor
usb_devcap_container_id_descriptor_t;
-@@ -379,7 +379,7 @@ struct usb_config_descriptor {
+@@ -379,7 +379,7 @@
#define UC_REMOTE_WAKEUP 0x20
uByte bMaxPower; /* max current in 2 mA units */
#define UC_POWER_FACTOR 2
@@ -87,7 +87,7 @@
typedef struct usb_config_descriptor usb_config_descriptor_t;
struct usb_interface_descriptor {
-@@ -392,7 +392,7 @@ struct usb_interface_descriptor {
+@@ -392,7 +392,7 @@
uByte bInterfaceSubClass;
uByte bInterfaceProtocol;
uByte iInterface;
@@ -96,7 +96,7 @@
typedef struct usb_interface_descriptor usb_interface_descriptor_t;
struct usb_interface_assoc_descriptor {
-@@ -404,7 +404,7 @@ struct usb_interface_assoc_descriptor {
+@@ -404,7 +404,7 @@
uByte bFunctionSubClass;
uByte bFunctionProtocol;
uByte iFunction;
@@ -105,7 +105,7 @@
typedef struct usb_interface_assoc_descriptor usb_interface_assoc_descriptor_t;
/* Interface class codes */
-@@ -530,7 +530,7 @@ struct usb_endpoint_descriptor {
+@@ -530,7 +530,7 @@
uWord wMaxPacketSize;
#define UE_ZERO_MPS 0xFFFF /* for internal use only */
uByte bInterval;
@@ -114,7 +114,7 @@
typedef struct usb_endpoint_descriptor usb_endpoint_descriptor_t;
struct usb_endpoint_ss_comp_descriptor {
-@@ -539,7 +539,7 @@ struct usb_endpoint_ss_comp_descriptor {
+@@ -539,7 +539,7 @@
uByte bMaxBurst;
uByte bmAttributes;
uWord wBytesPerInterval;
@@ -123,7 +123,7 @@
typedef struct usb_endpoint_ss_comp_descriptor
usb_endpoint_ss_comp_descriptor_t;
-@@ -548,7 +548,7 @@ struct usb_string_descriptor {
+@@ -548,7 +548,7 @@
uByte bDescriptorType;
uWord bString[126];
uByte bUnused;
@@ -132,7 +132,7 @@
typedef struct usb_string_descriptor usb_string_descriptor_t;
#define USB_MAKE_STRING_DESC(m,name) \
-@@ -556,7 +556,7 @@ struct name { \
+@@ -556,7 +556,7 @@
uByte bLength; \
uByte bDescriptorType; \
uByte bData[sizeof((uint8_t []){m})]; \
@@ -141,7 +141,7 @@
static const struct name name = { \
.bLength = sizeof(struct name), \
.bDescriptorType = UDESC_STRING, \
-@@ -590,7 +590,7 @@ struct usb_hub_descriptor {
+@@ -590,7 +590,7 @@
#define UHD_NOT_REMOV(desc, i) \
(((desc)->DeviceRemovable[(i)/8] >> ((i) % 8)) & 1)
uByte PortPowerCtrlMask[1]; /* deprecated */
@@ -150,7 +150,7 @@
typedef struct usb_hub_descriptor usb_hub_descriptor_t;
struct usb_hub_ss_descriptor {
-@@ -603,7 +603,7 @@ struct usb_hub_ss_descriptor {
+@@ -603,7 +603,7 @@
uByte bHubHdrDecLat;
uWord wHubDelay;
uByte DeviceRemovable[32]; /* max 255 ports */
@@ -159,7 +159,7 @@
typedef struct usb_hub_ss_descriptor usb_hub_ss_descriptor_t;
/* minimum HUB descriptor (8-ports maximum) */
-@@ -616,7 +616,7 @@ struct usb_hub_descriptor_min {
+@@ -616,7 +616,7 @@
uByte bHubContrCurrent;
uByte DeviceRemovable[1];
uByte PortPowerCtrlMask[1];
@@ -168,7 +168,7 @@
typedef struct usb_hub_descriptor_min usb_hub_descriptor_min_t;
struct usb_device_qualifier {
-@@ -629,7 +629,7 @@ struct usb_device_qualifier {
+@@ -629,7 +629,7 @@
uByte bMaxPacketSize0;
uByte bNumConfigurations;
uByte bReserved;
@@ -177,7 +177,7 @@
typedef struct usb_device_qualifier usb_device_qualifier_t;
struct usb_otg_descriptor {
-@@ -638,7 +638,7 @@ struct usb_otg_descriptor {
+@@ -638,7 +638,7 @@
uByte bmAttributes;
#define UOTG_SRP 0x01
#define UOTG_HNP 0x02
@@ -186,7 +186,7 @@
typedef struct usb_otg_descriptor usb_otg_descriptor_t;
/* OTG feature selectors */
-@@ -653,7 +653,7 @@ struct usb_status {
+@@ -653,7 +653,7 @@
#define UDS_REMOTE_WAKEUP 0x0002
/* Endpoint status flags */
#define UES_HALT 0x0001
@@ -195,7 +195,7 @@
typedef struct usb_status usb_status_t;
struct usb_hub_status {
-@@ -661,7 +661,7 @@ struct usb_hub_status {
+@@ -661,7 +661,7 @@
#define UHS_LOCAL_POWER 0x0001
#define UHS_OVER_CURRENT 0x0002
uWord wHubChange;
@@ -204,7 +204,7 @@
typedef struct usb_hub_status usb_hub_status_t;
struct usb_port_status {
-@@ -702,7 +702,7 @@ struct usb_port_status {
+@@ -702,7 +702,7 @@
#define UPS_C_BH_PORT_RESET 0x0020
#define UPS_C_PORT_LINK_STATE 0x0040
#define UPS_C_PORT_CONFIG_ERROR 0x0080
@@ -215,16 +215,16 @@
/*
--- a/sys/i386/include/cpufunc.h
+++ b/sys/i386/include/cpufunc.h
-@@ -38,6 +38,8 @@
- #ifndef _MACHINE_CPUFUNC_H_
- #define _MACHINE_CPUFUNC_H_
+@@ -42,6 +42,8 @@
+ #include <sys/types.h>
+
+#include <stdint.h>
+
#ifndef _SYS_CDEFS_H_
#error this file needs sys/cdefs.h as a prerequisite
#endif
-@@ -683,16 +685,11 @@ void enable_intr(void);
+@@ -687,16 +689,11 @@
void halt(void);
void ia32_pause(void);
u_char inb(u_int port);
@@ -241,7 +241,7 @@
void lidt(struct region_descriptor *addr);
void lldt(u_short sel);
void load_cr0(u_int cr0);
-@@ -710,11 +707,6 @@ void load_fs(u_int sel);
+@@ -714,11 +711,6 @@
void load_gs(u_int sel);
void ltr(u_short sel);
void outb(u_int port, u_char data);
@@ -263,7 +263,7 @@
/*
* Standard type definitions.
-@@ -39,10 +40,14 @@ typedef __uint32_t __blksize_t; /* file
+@@ -39,10 +40,14 @@
typedef __int64_t __blkcnt_t; /* file block count */
typedef __int32_t __clockid_t; /* clock_gettime()... */
typedef __uint32_t __fflags_t; /* file flags */
@@ -278,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 @@ typedef __uint32_t __dev_t; /* device nu
+@@ -93,13 +98,4 @@
typedef __uint32_t __fixpt_t; /* fixed point number */
Modified: trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff 2011-11-23 18:19:09 UTC (rev 3891)
+++ trunk/kfreebsd-kernel-headers/debian/patches/015_cam.diff 2011-11-23 19:14:53 UTC (rev 3892)
@@ -9,16 +9,6 @@
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
-
- #include <sys/cdefs.h>
-+#include <stdint.h>
-
- #ifdef _KERNEL
- /*
--- a/sys/i386/include/md_var.h
+++ b/sys/i386/include/md_var.h
@@ -32,6 +32,8 @@
@@ -41,17 +31,6 @@
/*
* Miscellaneous machine-dependent declarations.
*/
---- a/sys/sys/_mutex.h
-+++ b/sys/sys/_mutex.h
-@@ -31,6 +31,8 @@
- #ifndef _SYS__MUTEX_H_
- #define _SYS__MUTEX_H_
-
-+#include <stdint.h>
-+
- /*
- * Sleep/spin mutex.
- */
--- a/sys/sys/_timeval.h
+++ b/sys/sys/_timeval.h
@@ -30,6 +30,7 @@
@@ -62,7 +41,7 @@
#ifndef _SUSECONDS_T_DECLARED
typedef __suseconds_t suseconds_t;
-@@ -41,12 +42,4 @@ typedef __time_t time_t;
+@@ -41,12 +42,4 @@
#define _TIME_T_DECLARED
#endif
@@ -77,37 +56,36 @@
#endif /* !_SYS__TIMEVAL_H_ */
--- a/sys/sys/bio.h
+++ b/sys/sys/bio.h
-@@ -39,6 +39,15 @@
- #define _SYS_BIO_H_
-
+@@ -41,6 +41,15 @@
#include <sys/queue.h>
-+#include <stdint.h>
+ #include <stdint.h>
+
+/* FIXME: this struct is copied from BSDish sys/time.h. It should be somewhere else. (maybe Glibc?) */
+#ifndef bintime
+#define bintime bintime
+struct bintime {
-+ time_t sec;
-+ uint64_t frac;
++ time_t sec;
++ uint64_t frac;
+};
+#endif
-
++
/* bio_cmd */
#define BIO_READ 0x01
+ #define BIO_WRITE 0x02
--- a/sys/sys/devicestat.h
+++ b/sys/sys/devicestat.h
-@@ -33,6 +33,9 @@
+@@ -33,6 +33,8 @@
#include <sys/queue.h>
#include <sys/time.h>
+#include <sys/_types.h>
+#include <sys/resource.h>
-+#include <stdint.h>
+ #include <stdint.h>
/*
- * XXX: Should really be SPECNAMELEN
--- a/sys/sys/timespec.h
+++ b/sys/sys/timespec.h
-@@ -43,10 +43,7 @@ typedef __time_t time_t;
+@@ -43,10 +43,7 @@
#define _TIME_T_DECLARED
#endif
Modified: trunk/kfreebsd-kernel-headers/debian/patches/018_sys__types.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/018_sys__types.diff 2011-11-23 18:19:09 UTC (rev 3891)
+++ trunk/kfreebsd-kernel-headers/debian/patches/018_sys__types.diff 2011-11-23 19:14:53 UTC (rev 3892)
@@ -5,7 +5,7 @@
--- a/sys/sys/_types.h
+++ b/sys/sys/_types.h
-@@ -63,7 +63,6 @@ typedef __int64_t __rlim_t; /* resource
+@@ -63,7 +63,6 @@
typedef __uint8_t __sa_family_t;
typedef __uint32_t __socklen_t;
typedef long __suseconds_t; /* microseconds (signed) */
@@ -13,7 +13,7 @@
typedef struct __mq *__mqd_t; /* mq_open()... */
typedef __uint32_t __uid_t;
typedef unsigned int __useconds_t; /* microseconds (unsigned) */
-@@ -98,4 +97,62 @@ typedef __uint32_t __dev_t; /* device nu
+@@ -98,4 +97,62 @@
typedef __uint32_t __fixpt_t; /* fixed point number */
Modified: trunk/kfreebsd-kernel-headers/debian/patches/021_machine__types.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/021_machine__types.diff 2011-11-23 18:19:09 UTC (rev 3891)
+++ trunk/kfreebsd-kernel-headers/debian/patches/021_machine__types.diff 2011-11-23 19:14:53 UTC (rev 3892)
@@ -22,7 +22,7 @@
/*
* Basic types upon which most other types are built.
*/
-@@ -69,18 +72,19 @@ typedef long long __int64_t;
+@@ -69,18 +72,19 @@
/* LONGLONG */
typedef unsigned long long __uint64_t;
#endif
@@ -44,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 @@ typedef __int64_t __int_least64_t;
+@@ -92,9 +96,11 @@
typedef __int32_t __ptrdiff_t; /* ptr1 - ptr2 */
typedef __int32_t __register_t;
typedef __int32_t __segsz_t; /* segment size (in pages) */
@@ -75,7 +75,7 @@
/*
* Basic types upon which most other types are built.
*/
-@@ -56,16 +59,18 @@ typedef int __int32_t;
+@@ -56,16 +59,18 @@
typedef unsigned int __uint32_t;
typedef long __int64_t;
typedef unsigned long __uint64_t;
@@ -95,7 +95,7 @@
typedef __int64_t __intmax_t;
typedef __int64_t __intptr_t;
typedef __int32_t __int_fast8_t;
-@@ -79,9 +84,11 @@ typedef __int64_t __int_least64_t;
+@@ -79,9 +84,11 @@
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/023_packed.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/023_packed.diff 2011-11-23 18:19:09 UTC (rev 3891)
+++ trunk/kfreebsd-kernel-headers/debian/patches/023_packed.diff 2011-11-23 19:14:53 UTC (rev 3892)
@@ -15,7 +15,7 @@
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2009 Sam Leffler, Errno Consulting
* All rights reserved.
-@@ -47,7 +47,7 @@ struct ieee80211_plcp_hdr {
+@@ -47,7 +47,7 @@
uint8_t i_service;
uint16_t i_length;
uint16_t i_crc;
@@ -24,7 +24,7 @@
#define IEEE80211_PLCP_SFD 0xF3A0
#define IEEE80211_PLCP_SERVICE 0x00
-@@ -69,7 +69,7 @@ struct ieee80211_frame {
+@@ -69,7 +69,7 @@
uint8_t i_seq[2];
/* possibly followed by addr4[IEEE80211_ADDR_LEN]; */
/* see below */
@@ -33,7 +33,7 @@
struct ieee80211_qosframe {
uint8_t i_fc[2];
-@@ -81,7 +81,7 @@ struct ieee80211_qosframe {
+@@ -81,7 +81,7 @@
uint8_t i_qos[2];
/* possibly followed by addr4[IEEE80211_ADDR_LEN]; */
/* see below */
@@ -42,7 +42,7 @@
struct ieee80211_qoscntl {
uint8_t i_qos[2];
-@@ -95,7 +95,7 @@ struct ieee80211_frame_addr4 {
+@@ -95,7 +95,7 @@
uint8_t i_addr3[IEEE80211_ADDR_LEN];
uint8_t i_seq[2];
uint8_t i_addr4[IEEE80211_ADDR_LEN];
@@ -51,7 +51,7 @@
struct ieee80211_qosframe_addr4 {
-@@ -107,7 +107,7 @@ struct ieee80211_qosframe_addr4 {
+@@ -107,7 +107,7 @@
uint8_t i_seq[2];
uint8_t i_addr4[IEEE80211_ADDR_LEN];
uint8_t i_qos[2];
@@ -60,7 +60,7 @@
#define IEEE80211_FC0_VERSION_MASK 0x03
#define IEEE80211_FC0_VERSION_SHIFT 0
-@@ -218,7 +218,7 @@ struct ieee80211_wme_info {
+@@ -218,7 +218,7 @@
uint8_t wme_subtype; /* OUI subtype */
uint8_t wme_version; /* spec revision */
uint8_t wme_info; /* QoS info */
@@ -69,7 +69,7 @@
/*
* WME/802.11e Tspec Element
-@@ -246,7 +246,7 @@ struct ieee80211_wme_tspec {
+@@ -246,7 +246,7 @@
uint8_t ts_delay[4];
uint8_t ts_surplus[2];
uint8_t ts_medium_time[2];
@@ -78,7 +78,7 @@
/*
* WME AC parameter field
-@@ -255,7 +255,7 @@ struct ieee80211_wme_acparams {
+@@ -255,7 +255,7 @@
uint8_t acp_aci_aifsn;
uint8_t acp_logcwminmax;
uint16_t acp_txop;
@@ -87,7 +87,7 @@
#define WME_NUM_AC 4 /* 4 AC categories */
#define WME_NUM_TID 16 /* 16 tids */
-@@ -297,7 +297,7 @@ struct ieee80211_wme_param {
+@@ -297,7 +297,7 @@
#define WME_QOSINFO_COUNT 0x0f /* Mask for param count field */
uint8_t param_reserved;
struct ieee80211_wme_acparams params_acParams[WME_NUM_AC];
@@ -96,7 +96,7 @@
/*
* Management Notification Frame
-@@ -307,7 +307,7 @@ struct ieee80211_mnf {
+@@ -307,7 +307,7 @@
uint8_t mnf_action;
uint8_t mnf_dialog;
uint8_t mnf_status;
@@ -105,7 +105,7 @@
#define MNF_SETUP_REQ 0
#define MNF_SETUP_RESP 1
#define MNF_TEARDOWN 2
-@@ -319,7 +319,7 @@ struct ieee80211_mnf {
+@@ -319,7 +319,7 @@
struct ieee80211_action {
uint8_t ia_category;
uint8_t ia_action;
@@ -114,7 +114,7 @@
#define IEEE80211_ACTION_CAT_SM 0 /* Spectrum Management */
#define IEEE80211_ACTION_CAT_QOS 1 /* QoS */
-@@ -335,7 +335,7 @@ struct ieee80211_action {
+@@ -335,7 +335,7 @@
struct ieee80211_action_ht_txchwidth {
struct ieee80211_action at_header;
uint8_t at_chwidth;
@@ -123,7 +123,7 @@
#define IEEE80211_A_HT_TXCHWIDTH_20 0
#define IEEE80211_A_HT_TXCHWIDTH_2040 1
-@@ -344,7 +344,7 @@ struct ieee80211_action_ht_txchwidth {
+@@ -344,7 +344,7 @@
struct ieee80211_action_ht_mimopowersave {
struct ieee80211_action am_header;
uint8_t am_control;
@@ -132,7 +132,7 @@
#define IEEE80211_A_HT_MIMOPWRSAVE_ENA 0x01 /* PS enabled */
#define IEEE80211_A_HT_MIMOPWRSAVE_MODE 0x02
-@@ -388,7 +388,7 @@ struct ieee80211_action_ba_addbarequest
+@@ -388,7 +388,7 @@
uint16_t rq_baparamset;
uint16_t rq_batimeout; /* in TUs */
uint16_t rq_baseqctl;
@@ -141,7 +141,7 @@
/* BA - ADDBA response */
struct ieee80211_action_ba_addbaresponse {
-@@ -397,14 +397,14 @@ struct ieee80211_action_ba_addbaresponse
+@@ -397,14 +397,14 @@
uint16_t rs_statuscode;
uint16_t rs_baparamset;
uint16_t rs_batimeout; /* in TUs */
@@ -158,7 +158,7 @@
/* BAR Control */
#define IEEE80211_BAR_TID 0xf000 /* TID */
-@@ -420,7 +420,7 @@ struct ieee80211_action_ba_delba {
+@@ -420,7 +420,7 @@
struct ieee80211_ba_request {
uint16_t rq_barctl;
uint16_t rq_barseqctl;
@@ -167,7 +167,7 @@
/*
* Control frames.
-@@ -431,7 +431,7 @@ struct ieee80211_frame_min {
+@@ -431,7 +431,7 @@
uint8_t i_addr1[IEEE80211_ADDR_LEN];
uint8_t i_addr2[IEEE80211_ADDR_LEN];
/* FCS */
@@ -176,7 +176,7 @@
struct ieee80211_frame_rts {
uint8_t i_fc[2];
-@@ -439,21 +439,21 @@ struct ieee80211_frame_rts {
+@@ -439,21 +439,21 @@
uint8_t i_ra[IEEE80211_ADDR_LEN];
uint8_t i_ta[IEEE80211_ADDR_LEN];
/* FCS */
@@ -201,7 +201,7 @@
struct ieee80211_frame_pspoll {
uint8_t i_fc[2];
-@@ -461,7 +461,7 @@ struct ieee80211_frame_pspoll {
+@@ -461,7 +461,7 @@
uint8_t i_bssid[IEEE80211_ADDR_LEN];
uint8_t i_ta[IEEE80211_ADDR_LEN];
/* FCS */
@@ -210,7 +210,7 @@
struct ieee80211_frame_cfend { /* NB: also CF-End+CF-Ack */
uint8_t i_fc[2];
-@@ -469,7 +469,7 @@ struct ieee80211_frame_cfend { /* NB: a
+@@ -469,7 +469,7 @@
uint8_t i_ra[IEEE80211_ADDR_LEN];
uint8_t i_bssid[IEEE80211_ADDR_LEN];
/* FCS */
@@ -219,7 +219,7 @@
struct ieee80211_frame_bar {
uint8_t i_fc[2];
-@@ -479,7 +479,7 @@ struct ieee80211_frame_bar {
+@@ -479,7 +479,7 @@
uint16_t i_ctl;
uint16_t i_seq;
/* FCS */
@@ -228,7 +228,7 @@
/*
* BEACON management packets
-@@ -536,7 +536,7 @@ struct ieee80211_ie_wpa {
+@@ -536,7 +536,7 @@
uint16_t wpa_caps; /* 802.11i capabilities */
uint16_t wpa_pmkidcnt; /* 802.11i pmkid count */
uint16_t wpa_pmkids[8]; /* 802.11i pmkids */
@@ -237,7 +237,7 @@
/*
* 802.11n HT Capability IE
-@@ -551,7 +551,7 @@ struct ieee80211_ie_htcap {
+@@ -551,7 +551,7 @@
uint16_t hc_extcap; /* extended HT capabilities */
uint32_t hc_txbf; /* txbf capabilities */
uint8_t hc_antenna; /* antenna capabilities */
@@ -246,7 +246,7 @@
/* HT capability flags (ht_cap) */
#define IEEE80211_HTCAP_LDPC 0x0001 /* LDPC supported */
-@@ -631,7 +631,7 @@ struct ieee80211_ie_htinfo {
+@@ -631,7 +631,7 @@
uint8_t hi_byte3; /* ht ie byte 3 */
uint16_t hi_byte45; /* ht ie bytes 4+5 */
uint8_t hi_basicmcsset[16]; /* basic MCS set */
@@ -255,7 +255,7 @@
/* byte1 */
#define IEEE80211_HTINFO_2NDCHAN 0x03 /* secondary/ext chan offset */
-@@ -740,7 +740,7 @@ struct ieee80211_tim_ie {
+@@ -740,7 +740,7 @@
uint8_t tim_period; /* DTIM period */
uint8_t tim_bitctl; /* bitmap control */
uint8_t tim_bitmap[1]; /* variable-length bitmap */
@@ -264,7 +264,7 @@
struct ieee80211_country_ie {
uint8_t ie; /* IEEE80211_ELEMID_COUNTRY */
-@@ -750,8 +750,8 @@ struct ieee80211_country_ie {
+@@ -750,8 +750,8 @@
uint8_t schan; /* starting channel */
uint8_t nchan; /* number channels */
uint8_t maxtxpwr; /* tx power cap */
@@ -275,7 +275,7 @@
#define IEEE80211_COUNTRY_MAX_BANDS 84 /* max possible bands */
#define IEEE80211_COUNTRY_MAX_SIZE \
-@@ -766,7 +766,7 @@ struct ieee80211_csa_ie {
+@@ -766,7 +766,7 @@
uint8_t csa_mode; /* Channel Switch Mode */
uint8_t csa_newchan; /* New Channel Number */
uint8_t csa_count; /* Channel Switch Count */
@@ -286,7 +286,7 @@
* Note the min acceptable CSA count is used to guard against
--- a/sys/sys/ata.h
+++ b/sys/sys/ata.h
-@@ -185,7 +185,7 @@ struct ata_params {
+@@ -185,7 +185,7 @@
#define ATA_SUPPORT_WRITEDMAQFUAEXT 0x0080
#define ATA_SUPPORT_64BITWWN 0x0100
#define ATA_SUPPORT_UNLOAD 0x2000
@@ -295,7 +295,7 @@
/*088*/ u_int16_t udmamodes; /* UltraDMA modes */
/*089*/ u_int16_t erase_time;
-@@ -258,7 +258,7 @@ struct ata_params {
+@@ -258,7 +258,7 @@
/*223*/ u_int16_t transport_minor;
u_int16_t reserved224[31];
/*255*/ u_int16_t integrity;
@@ -304,7 +304,7 @@
/* ATA transfer modes */
-@@ -474,7 +474,7 @@ struct atapi_sense {
+@@ -474,7 +474,7 @@
u_int8_t specific1; /* sense key specific */
u_int8_t specific2; /* sense key specific */
@@ -315,7 +315,7 @@
union {
--- a/sys/dev/ata/atapi-cd.h
+++ b/sys/dev/ata/atapi-cd.h
-@@ -267,7 +267,7 @@ struct write_param {
+@@ -267,7 +267,7 @@
u_int8_t vendor_specific_byte1;
u_int8_t vendor_specific_byte2;
u_int8_t vendor_specific_byte3;
@@ -326,7 +326,7 @@
struct acd_track_info {
--- a/sys/dev/ciss/cissio.h
+++ b/sys/dev/ciss/cissio.h
-@@ -108,18 +108,18 @@ typedef union {
+@@ -109,18 +109,18 @@
u_int8_t Dev;
u_int8_t Bus:6;
u_int8_t Mode:2;
@@ -348,7 +348,7 @@
} SCSI3Addr_struct;
typedef struct {
-@@ -127,20 +127,20 @@ typedef struct {
+@@ -128,20 +128,20 @@
u_int32_t Bus:6;
u_int32_t Mode:2;
SCSI3Addr_struct Target[2];
@@ -372,7 +372,7 @@
typedef struct {
u_int8_t CDBLen;
-@@ -148,24 +148,24 @@ typedef struct {
+@@ -149,24 +149,24 @@
u_int8_t Type:3;
u_int8_t Attribute:3;
u_int8_t Direction:2;
@@ -402,7 +402,7 @@
typedef struct {
u_int8_t ScsiStatus;
-@@ -174,7 +174,7 @@ typedef struct {
+@@ -175,7 +175,7 @@
u_int32_t ResidualCnt;
MoreErrInfo_struct MoreErrInfo;
u_int8_t SenseInfo[SENSEINFOBYTES];
@@ -411,7 +411,7 @@
typedef struct {
LUNAddr_struct LUN_info; /* 8 */
-@@ -182,7 +182,7 @@ typedef struct {
+@@ -183,7 +183,7 @@
ErrorInfo_struct error_info; /* 48 */
u_int16_t buf_size; /* 2 */
u_int8_t *buf; /* 4 */
@@ -420,7 +420,7 @@
#ifdef __amd64__
typedef struct {
-@@ -191,7 +191,7 @@ typedef struct {
+@@ -192,7 +192,7 @@
ErrorInfo_struct error_info; /* 48 */
u_int16_t buf_size; /* 2 */
u_int32_t buf; /* 4 */
@@ -431,7 +431,7 @@
/************************************************************************
--- a/sys/amd64/include/segments.h
+++ b/sys/amd64/include/segments.h
-@@ -72,7 +72,7 @@ struct user_segment_descriptor {
+@@ -72,7 +72,7 @@
u_int64_t sd_def32:1; /* default 32 vs 16 bit size */
u_int64_t sd_gran:1; /* limit granularity (byte/page units)*/
u_int64_t sd_hibase:8; /* segment base address (msb) */
@@ -440,7 +440,7 @@
/*
* System segment descriptors (128 bit wide)
-@@ -86,11 +86,11 @@ struct system_segment_descriptor {
+@@ -86,11 +86,11 @@
u_int64_t sd_hilimit:4; /* segment extent (msb) */
u_int64_t sd_xx0:3; /* unused */
u_int64_t sd_gran:1; /* limit granularity (byte/page units)*/
@@ -454,7 +454,7 @@
/*
* Gate descriptors (e.g. indirect descriptors, trap, interrupt etc. 128 bit)
-@@ -104,9 +104,9 @@ struct gate_descriptor {
+@@ -104,9 +104,9 @@
u_int64_t gd_type:5; /* segment type */
u_int64_t gd_dpl:2; /* segment descriptor priority level */
u_int64_t gd_p:1; /* segment descriptor present */
@@ -466,7 +466,7 @@
/*
* Generic descriptor
-@@ -167,15 +167,15 @@ struct soft_segment_descriptor {
+@@ -167,15 +167,15 @@
unsigned long ssd_long:1; /* long mode (for %cs) */
unsigned long ssd_def32:1; /* default 32 vs 16 bit size */
unsigned long ssd_gran:1; /* limit granularity (byte/page units)*/
@@ -487,7 +487,7 @@
* Size of IDT table
--- a/sys/net80211/ieee80211_ioctl.h
+++ b/sys/net80211/ieee80211_ioctl.h
-@@ -321,7 +321,7 @@ enum {
+@@ -321,7 +321,7 @@
struct ieee80211req_maclist {
uint8_t ml_macaddr[IEEE80211_ADDR_LEN];
Modified: trunk/kfreebsd-kernel-headers/debian/patches/025_iconv.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/025_iconv.diff 2011-11-23 18:19:09 UTC (rev 3891)
+++ trunk/kfreebsd-kernel-headers/debian/patches/025_iconv.diff 2011-11-23 19:14:53 UTC (rev 3892)
@@ -4,7 +4,7 @@
--- a/sys/sys/iconv.h
+++ b/sys/sys/iconv.h
-@@ -94,7 +94,7 @@ __BEGIN_DECLS
+@@ -94,7 +94,7 @@
#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-11-23 18:19:09 UTC (rev 3891)
+++ trunk/kfreebsd-kernel-headers/debian/patches/026_acpiio.diff 2011-11-23 19:14:53 UTC (rev 3892)
@@ -4,10 +4,10 @@
--- a/sys/dev/acpica/acpiio.h
+++ b/sys/dev/acpica/acpiio.h
-@@ -30,6 +30,8 @@
- #ifndef _ACPIIO_H_
- #define _ACPIIO_H_
+@@ -32,6 +32,8 @@
+ #include <stdint.h>
+
+#include <stdint.h>
+
/*
Modified: trunk/kfreebsd-kernel-headers/debian/patches/027_ktrace.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/027_ktrace.diff 2011-11-23 18:19:09 UTC (rev 3891)
+++ trunk/kfreebsd-kernel-headers/debian/patches/027_ktrace.diff 2011-11-23 19:14:53 UTC (rev 3892)
@@ -4,10 +4,10 @@
--- a/sys/sys/ktrace.h
+++ b/sys/sys/ktrace.h
-@@ -33,6 +33,19 @@
- #ifndef _SYS_KTRACE_H_
- #define _SYS_KTRACE_H_
+@@ -35,6 +35,19 @@
+ #include <sys/types.h>
+
+#include <features.h>
+
+#include <stdint.h>
Modified: trunk/kfreebsd-kernel-headers/debian/patches/029_conf.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/029_conf.diff 2011-11-23 18:19:09 UTC (rev 3891)
+++ trunk/kfreebsd-kernel-headers/debian/patches/029_conf.diff 2011-11-23 19:14:53 UTC (rev 3892)
@@ -12,7 +12,7 @@
#include <sys/queue.h>
#endif
-@@ -268,10 +269,10 @@ void dev_refl(struct cdev *dev);
+@@ -268,10 +269,10 @@
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,
@@ -25,7 +25,7 @@
#define MAKEDEV_REF 0x01
#define MAKEDEV_WHTOUT 0x02
#define MAKEDEV_NOWAIT 0x04
-@@ -280,12 +281,11 @@ struct cdev *make_dev_cred(struct cdevsw
+@@ -280,12 +281,11 @@
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/031_ufs.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/031_ufs.diff 2011-11-23 18:19:09 UTC (rev 3891)
+++ trunk/kfreebsd-kernel-headers/debian/patches/031_ufs.diff 2011-11-23 19:14:53 UTC (rev 3892)
@@ -4,7 +4,7 @@
--- a/sys/ufs/ufs/quota.h
+++ b/sys/ufs/ufs/quota.h
-@@ -205,7 +205,6 @@ int quotaoff(struct thread *td, struct m
+@@ -205,7 +205,6 @@
int quotaon(struct thread *td, struct mount *, int, void *);
int setquota(struct thread *, struct mount *, u_long, int, void *);
int setuse(struct thread *, struct mount *, u_long, int, void *);
Modified: trunk/kfreebsd-kernel-headers/debian/patches/033_pcpu.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/033_pcpu.diff 2011-11-23 18:19:09 UTC (rev 3891)
+++ trunk/kfreebsd-kernel-headers/debian/patches/033_pcpu.diff 2011-11-23 19:14:53 UTC (rev 3892)
@@ -11,9 +11,9 @@
+#include <sys/_types.h>
+#include <stdint.h>
- /*
- * Define a set for pcpu data.
-@@ -150,7 +152,7 @@ struct pcpu {
+ #include <stdint.h>
+
+@@ -152,7 +154,7 @@
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-11-23 18:19:09 UTC (rev 3891)
+++ trunk/kfreebsd-kernel-headers/debian/patches/034_usb.diff 2011-11-23 19:14:53 UTC (rev 3892)
@@ -8,7 +8,7 @@
--- a/sys/dev/usb/usb.h
+++ b/sys/dev/usb/usb.h
-@@ -752,4 +752,12 @@ enum usb_dev_state {
+@@ -752,4 +752,12 @@
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-11-23 18:19:09 UTC (rev 3891)
+++ trunk/kfreebsd-kernel-headers/debian/patches/035_devfs_int.diff 2011-11-23 19:14:53 UTC (rev 3892)
@@ -4,7 +4,7 @@
--- a/sys/fs/devfs/devfs_int.h
+++ b/sys/fs/devfs/devfs_int.h
-@@ -68,6 +68,9 @@ struct cdev_priv {
+@@ -68,6 +68,9 @@
LIST_HEAD(, cdev_privdata) cdp_fdpriv;
};
Modified: trunk/kfreebsd-kernel-headers/debian/patches/038_gnuclike.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/038_gnuclike.diff 2011-11-23 18:19:09 UTC (rev 3891)
+++ trunk/kfreebsd-kernel-headers/debian/patches/038_gnuclike.diff 2011-11-23 19:14:53 UTC (rev 3892)
@@ -36,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 @@ ATOMIC_STORE_LOAD(long, "cmpxchgq %0,%1"
+@@ -303,7 +303,7 @@
#ifndef WANT_FUNCTIONS
/* Read the current value and store a zero in the destination. */
@@ -47,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 @@ bus_space_read_multi_1(bus_space_tag_t t
+@@ -272,7 +272,7 @@
if (tag == AMD64_BUS_SPACE_IO)
insb(bsh + offset, addr, count);
else {
@@ -56,7 +56,7 @@
__asm __volatile(" \n\
cld \n\
1: movb (%2),%%al \n\
-@@ -293,7 +293,7 @@ bus_space_read_multi_2(bus_space_tag_t t
+@@ -293,7 +293,7 @@
if (tag == AMD64_BUS_SPACE_IO)
insw(bsh + offset, addr, count);
else {
@@ -65,7 +65,7 @@
__asm __volatile(" \n\
cld \n\
1: movw (%2),%%ax \n\
-@@ -314,7 +314,7 @@ bus_space_read_multi_4(bus_space_tag_t t
+@@ -314,7 +314,7 @@
if (tag == AMD64_BUS_SPACE_IO)
insl(bsh + offset, addr, count);
else {
@@ -74,7 +74,7 @@
__asm __volatile(" \n\
cld \n\
1: movl (%2),%%eax \n\
-@@ -359,7 +359,7 @@ bus_space_read_region_1(bus_space_tag_t
+@@ -359,7 +359,7 @@
if (tag == AMD64_BUS_SPACE_IO) {
int _port_ = bsh + offset;
@@ -83,7 +83,7 @@
__asm __volatile(" \n\
cld \n\
1: inb %w2,%%al \n\
-@@ -372,7 +372,7 @@ bus_space_read_region_1(bus_space_tag_t
+@@ -372,7 +372,7 @@
#endif
} else {
bus_space_handle_t _port_ = bsh + offset;
@@ -92,7 +92,7 @@
__asm __volatile(" \n\
cld \n\
repne \n\
-@@ -391,7 +391,7 @@ bus_space_read_region_2(bus_space_tag_t
+@@ -391,7 +391,7 @@
if (tag == AMD64_BUS_SPACE_IO) {
int _port_ = bsh + offset;
@@ -101,7 +101,7 @@
__asm __volatile(" \n\
cld \n\
1: inw %w2,%%ax \n\
-@@ -404,7 +404,7 @@ bus_space_read_region_2(bus_space_tag_t
+@@ -404,7 +404,7 @@
#endif
} else {
bus_space_handle_t _port_ = bsh + offset;
@@ -110,7 +110,7 @@
__asm __volatile(" \n\
cld \n\
repne \n\
-@@ -423,7 +423,7 @@ bus_space_read_region_4(bus_space_tag_t
+@@ -423,7 +423,7 @@
if (tag == AMD64_BUS_SPACE_IO) {
int _port_ = bsh + offset;
@@ -119,7 +119,7 @@
__asm __volatile(" \n\
cld \n\
1: inl %w2,%%eax \n\
-@@ -436,7 +436,7 @@ bus_space_read_region_4(bus_space_tag_t
+@@ -436,7 +436,7 @@
#endif
} else {
bus_space_handle_t _port_ = bsh + offset;
@@ -128,7 +128,7 @@
__asm __volatile(" \n\
cld \n\
repne \n\
-@@ -536,7 +536,7 @@ bus_space_write_multi_1(bus_space_tag_t
+@@ -536,7 +536,7 @@
if (tag == AMD64_BUS_SPACE_IO)
outsb(bsh + offset, addr, count);
else {
@@ -137,7 +137,7 @@
__asm __volatile(" \n\
cld \n\
1: lodsb \n\
-@@ -557,7 +557,7 @@ bus_space_write_multi_2(bus_space_tag_t
+@@ -557,7 +557,7 @@
if (tag == AMD64_BUS_SPACE_IO)
outsw(bsh + offset, addr, count);
else {
@@ -146,7 +146,7 @@
__asm __volatile(" \n\
cld \n\
1: lodsw \n\
-@@ -578,7 +578,7 @@ bus_space_write_multi_4(bus_space_tag_t
+@@ -578,7 +578,7 @@
if (tag == AMD64_BUS_SPACE_IO)
outsl(bsh + offset, addr, count);
else {
@@ -155,7 +155,7 @@
__asm __volatile(" \n\
cld \n\
1: lodsl \n\
-@@ -624,7 +624,7 @@ bus_space_write_region_1(bus_space_tag_t
+@@ -624,7 +624,7 @@
if (tag == AMD64_BUS_SPACE_IO) {
int _port_ = bsh + offset;
@@ -164,7 +164,7 @@
__asm __volatile(" \n\
cld \n\
1: lodsb \n\
-@@ -637,7 +637,7 @@ bus_space_write_region_1(bus_space_tag_t
+@@ -637,7 +637,7 @@
#endif
} else {
bus_space_handle_t _port_ = bsh + offset;
@@ -173,7 +173,7 @@
__asm __volatile(" \n\
cld \n\
repne \n\
-@@ -656,7 +656,7 @@ bus_space_write_region_2(bus_space_tag_t
+@@ -656,7 +656,7 @@
if (tag == AMD64_BUS_SPACE_IO) {
int _port_ = bsh + offset;
@@ -182,7 +182,7 @@
__asm __volatile(" \n\
cld \n\
1: lodsw \n\
-@@ -669,7 +669,7 @@ bus_space_write_region_2(bus_space_tag_t
+@@ -669,7 +669,7 @@
#endif
} else {
bus_space_handle_t _port_ = bsh + offset;
@@ -191,7 +191,7 @@
__asm __volatile(" \n\
cld \n\
repne \n\
-@@ -688,7 +688,7 @@ bus_space_write_region_4(bus_space_tag_t
+@@ -688,7 +688,7 @@
if (tag == AMD64_BUS_SPACE_IO) {
int _port_ = bsh + offset;
@@ -200,7 +200,7 @@
__asm __volatile(" \n\
cld \n\
1: lodsl \n\
-@@ -701,7 +701,7 @@ bus_space_write_region_4(bus_space_tag_t
+@@ -701,7 +701,7 @@
#endif
} else {
bus_space_handle_t _port_ = bsh + offset;
@@ -209,7 +209,7 @@
__asm __volatile(" \n\
cld \n\
repne \n\
-@@ -996,7 +996,7 @@ static __inline void
+@@ -996,7 +996,7 @@
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)
{
@@ -220,7 +220,7 @@
else
--- a/sys/amd64/include/cpufunc.h
+++ b/sys/amd64/include/cpufunc.h
-@@ -55,7 +55,7 @@ struct region_descriptor;
+@@ -57,7 +57,7 @@
#define writel(va, d) (*(volatile u_int32_t *) (va) = (d))
#define writeq(va, d) (*(volatile u_int64_t *) (va) = (d))
@@ -231,7 +231,7 @@
breakpoint(void)
--- a/sys/amd64/include/endian.h
+++ b/sys/amd64/include/endian.h
-@@ -67,7 +67,7 @@ extern "C" {
+@@ -67,7 +67,7 @@
#define BYTE_ORDER _BYTE_ORDER
#endif
@@ -242,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 @@ typedef enum {
+@@ -122,7 +122,7 @@
#define SSE_RND_OFF 13 /* rounding control offset */
#define SSE_FZ_OFF 15 /* flush to zero offset */
@@ -251,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 @@ __fpgetsticky(void)
+@@ -277,7 +277,7 @@
#endif /* __GNUCLIKE_ASM */
@@ -262,7 +262,7 @@
#define fpgetprec() __fpgetprec()
--- a/sys/amd64/include/pcpu.h
+++ b/sys/amd64/include/pcpu.h
-@@ -91,7 +91,7 @@ extern struct pcpu *pcpup;
+@@ -93,7 +93,7 @@
#define PCPU_PTR(member) (&pcpup->pc_ ## member)
#define PCPU_SET(member, val) (pcpup->pc_ ## member = (val))
@@ -273,7 +273,7 @@
* Evaluates to the byte offset of the per-cpu variable name.
--- a/sys/amd64/include/profile.h
+++ b/sys/amd64/include/profile.h
-@@ -57,7 +57,7 @@
+@@ -59,7 +59,7 @@
#define MCOUNT_DECL(s)
#define MCOUNT_ENTER(s)
#define MCOUNT_EXIT(s)
@@ -282,7 +282,7 @@
#define MCOUNT_OVERHEAD(label) \
__asm __volatile("pushq %0; call __mcount; popq %%rcx" \
: \
-@@ -112,7 +112,7 @@ void user(void);
+@@ -114,7 +114,7 @@
static void _mcount(uintfptr_t frompc, uintfptr_t selfpc) __used; \
static void _mcount
@@ -291,7 +291,7 @@
#define MCOUNT __asm(" \n\
.text \n\
.p2align 4,0x90 \n\
-@@ -191,7 +191,7 @@ void mcount(uintfptr_t frompc, uintfptr_
+@@ -193,7 +193,7 @@
#include <sys/cdefs.h>
__BEGIN_DECLS
@@ -313,7 +313,7 @@
__builtin_va_start((ap), (last))
--- a/sys/amd64/include/_types.h
+++ b/sys/amd64/include/_types.h
-@@ -110,7 +110,7 @@ typedef __uint64_t __vm_size_t;
+@@ -110,7 +110,7 @@
/*
* Unusual type definitions.
*/
@@ -333,7 +333,7 @@
#include <sys/_types.h>
-@@ -71,7 +71,7 @@ typedef char *va_list;
+@@ -71,7 +71,7 @@
#define __va_size(type) \
(((sizeof(type) + sizeof(int) - 1) / sizeof(int)) * sizeof(int))
@@ -353,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 @@ atomic_fetchadd_long(volatile u_long *p,
+@@ -307,7 +307,7 @@
}
/* Read the current value and store a zero in the destination. */
@@ -364,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 @@ bus_space_read_multi_1(bus_space_tag_t t
+@@ -276,7 +276,7 @@
if (tag == I386_BUS_SPACE_IO)
insb(bsh + offset, addr, count);
else {
@@ -373,7 +373,7 @@
__asm __volatile(" \n\
cld \n\
1: movb (%2),%%al \n\
-@@ -301,7 +301,7 @@ bus_space_read_multi_2(bus_space_tag_t t
+@@ -301,7 +301,7 @@
if (tag == I386_BUS_SPACE_IO)
insw(bsh + offset, addr, count);
else {
@@ -382,7 +382,7 @@
__asm __volatile(" \n\
cld \n\
1: movw (%2),%%ax \n\
-@@ -326,7 +326,7 @@ bus_space_read_multi_4(bus_space_tag_t t
+@@ -326,7 +326,7 @@
if (tag == I386_BUS_SPACE_IO)
insl(bsh + offset, addr, count);
else {
@@ -391,7 +391,7 @@
__asm __volatile(" \n\
cld \n\
1: movl (%2),%%eax \n\
-@@ -375,7 +375,7 @@ bus_space_read_region_1(bus_space_tag_t
+@@ -375,7 +375,7 @@
if (tag == I386_BUS_SPACE_IO) {
int _port_ = bsh + offset;
@@ -400,7 +400,7 @@
__asm __volatile(" \n\
cld \n\
1: inb %w2,%%al \n\
-@@ -392,7 +392,7 @@ bus_space_read_region_1(bus_space_tag_t
+@@ -392,7 +392,7 @@
#endif
} else {
int _port_ = bsh + offset;
@@ -409,7 +409,7 @@
__asm __volatile(" \n\
cld \n\
repne \n\
-@@ -415,7 +415,7 @@ bus_space_read_region_2(bus_space_tag_t
+@@ -415,7 +415,7 @@
if (tag == I386_BUS_SPACE_IO) {
int _port_ = bsh + offset;
@@ -418,7 +418,7 @@
__asm __volatile(" \n\
cld \n\
1: inw %w2,%%ax \n\
-@@ -432,7 +432,7 @@ bus_space_read_region_2(bus_space_tag_t
+@@ -432,7 +432,7 @@
#endif
} else {
int _port_ = bsh + offset;
@@ -427,7 +427,7 @@
__asm __volatile(" \n\
cld \n\
repne \n\
-@@ -455,7 +455,7 @@ bus_space_read_region_4(bus_space_tag_t
+@@ -455,7 +455,7 @@
if (tag == I386_BUS_SPACE_IO) {
int _port_ = bsh + offset;
@@ -436,7 +436,7 @@
__asm __volatile(" \n\
cld \n\
1: inl %w2,%%eax \n\
-@@ -472,7 +472,7 @@ bus_space_read_region_4(bus_space_tag_t
+@@ -472,7 +472,7 @@
#endif
} else {
int _port_ = bsh + offset;
@@ -445,7 +445,7 @@
__asm __volatile(" \n\
cld \n\
repne \n\
-@@ -576,7 +576,7 @@ bus_space_write_multi_1(bus_space_tag_t
+@@ -576,7 +576,7 @@
if (tag == I386_BUS_SPACE_IO)
outsb(bsh + offset, addr, count);
else {
@@ -454,7 +454,7 @@
__asm __volatile(" \n\
cld \n\
1: lodsb \n\
-@@ -601,7 +601,7 @@ bus_space_write_multi_2(bus_space_tag_t
+@@ -601,7 +601,7 @@
if (tag == I386_BUS_SPACE_IO)
outsw(bsh + offset, addr, count);
else {
@@ -463,7 +463,7 @@
__asm __volatile(" \n\
cld \n\
1: lodsw \n\
-@@ -626,7 +626,7 @@ bus_space_write_multi_4(bus_space_tag_t
+@@ -626,7 +626,7 @@
if (tag == I386_BUS_SPACE_IO)
outsl(bsh + offset, addr, count);
else {
@@ -472,7 +472,7 @@
__asm __volatile(" \n\
cld \n\
1: lodsl \n\
-@@ -676,7 +676,7 @@ bus_space_write_region_1(bus_space_tag_t
+@@ -676,7 +676,7 @@
if (tag == I386_BUS_SPACE_IO) {
int _port_ = bsh + offset;
@@ -481,7 +481,7 @@
__asm __volatile(" \n\
cld \n\
1: lodsb \n\
-@@ -693,7 +693,7 @@ bus_space_write_region_1(bus_space_tag_t
+@@ -693,7 +693,7 @@
#endif
} else {
int _port_ = bsh + offset;
@@ -490,7 +490,7 @@
__asm __volatile(" \n\
cld \n\
repne \n\
-@@ -716,7 +716,7 @@ bus_space_write_region_2(bus_space_tag_t
+@@ -716,7 +716,7 @@
if (tag == I386_BUS_SPACE_IO) {
int _port_ = bsh + offset;
@@ -499,7 +499,7 @@
__asm __volatile(" \n\
cld \n\
1: lodsw \n\
-@@ -733,7 +733,7 @@ bus_space_write_region_2(bus_space_tag_t
+@@ -733,7 +733,7 @@
#endif
} else {
int _port_ = bsh + offset;
@@ -508,7 +508,7 @@
__asm __volatile(" \n\
cld \n\
repne \n\
-@@ -756,7 +756,7 @@ bus_space_write_region_4(bus_space_tag_t
+@@ -756,7 +756,7 @@
if (tag == I386_BUS_SPACE_IO) {
int _port_ = bsh + offset;
@@ -517,7 +517,7 @@
__asm __volatile(" \n\
cld \n\
1: lodsl \n\
-@@ -773,7 +773,7 @@ bus_space_write_region_4(bus_space_tag_t
+@@ -773,7 +773,7 @@
#endif
} else {
int _port_ = bsh + offset;
@@ -526,7 +526,7 @@
__asm __volatile(" \n\
cld \n\
repne \n\
-@@ -1072,7 +1072,7 @@ static __inline void
+@@ -1072,7 +1072,7 @@
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)
{
@@ -537,7 +537,7 @@
else
--- a/sys/i386/include/cpufunc.h
+++ b/sys/i386/include/cpufunc.h
-@@ -65,7 +65,7 @@ struct region_descriptor;
+@@ -69,7 +69,7 @@
#define writew(va, d) (*(volatile u_int16_t *) (va) = (d))
#define writel(va, d) (*(volatile u_int32_t *) (va) = (d))
@@ -548,7 +548,7 @@
breakpoint(void)
--- a/sys/i386/include/endian.h
+++ b/sys/i386/include/endian.h
-@@ -67,7 +67,7 @@ extern "C" {
+@@ -67,7 +67,7 @@
#define BYTE_ORDER _BYTE_ORDER
#endif
@@ -559,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 @@ typedef enum {
+@@ -104,7 +104,7 @@
*/
#define FP_STKY_OFF 0 /* sticky flags offset */
@@ -579,7 +579,7 @@
static __inline u_int
in_cksum_hdr(const struct ip *ip)
{
-@@ -131,7 +131,7 @@ in_pseudo(u_int sum, u_int b, u_int c)
+@@ -131,7 +131,7 @@
#endif
#ifdef _KERNEL
@@ -590,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 @@ extern struct pcpu *pcpup;
+@@ -103,7 +103,7 @@
#define PCPU_PTR(member) (&pcpup->pc_ ## member)
#define PCPU_SET(member, val) (pcpup->pc_ ## member = (val))
@@ -601,7 +601,7 @@
* Evaluates to the byte offset of the per-cpu variable name.
--- a/sys/i386/include/profile.h
+++ b/sys/i386/include/profile.h
-@@ -57,7 +57,7 @@
+@@ -59,7 +59,7 @@
#define MCOUNT_DECL(s)
#define MCOUNT_ENTER(s)
#define MCOUNT_EXIT(s)
@@ -610,7 +610,7 @@
#define MCOUNT_OVERHEAD(label) \
__asm __volatile("pushl %0; call __mcount; popl %%ecx" \
: \
-@@ -110,7 +110,7 @@ void user(void);
+@@ -112,7 +112,7 @@
#define _MCOUNT_DECL static __inline void _mcount
@@ -619,7 +619,7 @@
#define MCOUNT \
void \
mcount() \
-@@ -165,7 +165,7 @@ void mcount(uintfptr_t frompc, uintfptr_
+@@ -167,7 +167,7 @@
#include <sys/cdefs.h>
__BEGIN_DECLS
@@ -639,7 +639,7 @@
#define va_start(ap, last) \
__builtin_va_start((ap), (last))
-@@ -67,7 +67,7 @@ typedef __va_list va_list;
+@@ -67,7 +67,7 @@
#define __va_size(type) \
(((sizeof(type) + sizeof(int) - 1) / sizeof(int)) * sizeof(int))
@@ -650,7 +650,7 @@
#else /* !__GNUCLIKE_BUILTIN_NEXT_ARG */
--- a/sys/i386/include/_types.h
+++ b/sys/i386/include/_types.h
-@@ -63,7 +63,7 @@ typedef unsigned int __uint32_t;
+@@ -63,7 +63,7 @@
typedef long long __int64_t;
/* LONGLONG */
typedef unsigned long long __uint64_t;
@@ -659,7 +659,7 @@
typedef int __attribute__((__mode__(__DI__))) __int64_t;
typedef unsigned int __attribute__((__mode__(__DI__))) __uint64_t;
#else
-@@ -126,7 +126,7 @@ typedef __uint32_t __vm_size_t;
+@@ -126,7 +126,7 @@
/*
* Unusual type definitions.
*/
@@ -679,7 +679,7 @@
#include <sys/_types.h>
-@@ -67,7 +67,7 @@ typedef char *va_list;
+@@ -67,7 +67,7 @@
#define __va_size(type) \
(((sizeof(type) + sizeof(int) - 1) / sizeof(int)) * sizeof(int))
@@ -697,11 +697,11 @@
-#ifdef __GNUCLIKE___SECTION
+#ifdef __GNUC__
#define __MAKE_SET(set, sym) \
- static void const * const __set_##set##_sym_##sym \
- __section("set_" #set) __used = &sym
+ __GLOBL(__CONCAT(__start_set_,set)); \
+ __GLOBL(__CONCAT(__stop_set_,set)); \
--- a/sys/mips/include/endian.h
+++ b/sys/mips/include/endian.h
-@@ -68,7 +68,7 @@ extern "C" {
+@@ -68,7 +68,7 @@
#endif
#ifndef __ASSEMBLER__
@@ -712,7 +712,7 @@
#define __is_constant(x) 0
--- a/sys/mips/include/_types.h
+++ b/sys/mips/include/_types.h
-@@ -63,7 +63,7 @@ typedef unsigned long __uint64_t;
+@@ -63,7 +63,7 @@
typedef long long __int64_t;
/* LONGLONG */
typedef unsigned long long __uint64_t;
@@ -721,7 +721,7 @@
typedef int __attribute__((__mode__(__DI__))) __int64_t;
typedef unsigned int __attribute__((__mode__(__DI__))) __uint64_t;
#else
-@@ -154,11 +154,11 @@ typedef __uint64_t __vm_pindex_t;
+@@ -154,11 +154,11 @@
/*
* Unusual type definitions.
*/
Modified: trunk/kfreebsd-kernel-headers/debian/patches/040_internal_types.patch
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/040_internal_types.patch 2011-11-23 18:19:09 UTC (rev 3891)
+++ trunk/kfreebsd-kernel-headers/debian/patches/040_internal_types.patch 2011-11-23 19:14:53 UTC (rev 3892)
@@ -13,7 +13,7 @@
#define cr_startcopy cr_uid
uid_t cr_uid; /* effective user id */
uid_t cr_ruid; /* real user id */
-@@ -58,7 +58,7 @@ struct ucred {
+@@ -58,7 +58,7 @@
struct uidinfo *cr_ruidinfo; /* per ruid resource consumption */
struct prison *cr_prison; /* jail(2) */
void *cr_pspare; /* general use */
@@ -22,7 +22,7 @@
void *cr_pspare2[2]; /* general use 2 */
#define cr_endcopy cr_label
struct label *cr_label; /* MAC label */
-@@ -76,7 +76,7 @@ struct ucred {
+@@ -76,7 +76,7 @@
* This is the external representation of struct ucred.
*/
struct xucred {
Modified: trunk/kfreebsd-kernel-headers/debian/patches/series
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/series 2011-11-23 18:19:09 UTC (rev 3891)
+++ trunk/kfreebsd-kernel-headers/debian/patches/series 2011-11-23 19:14:53 UTC (rev 3892)
@@ -36,8 +36,6 @@
033_pcpu.diff
034_usb.diff
035_devfs_int.diff
-036_tcpvar.diff
-037_ciss.diff
038_gnuclike.diff
039_mips_misc.diff
040_internal_types.patch
More information about the Glibc-bsd-commits
mailing list