History

Merge tag 'v3.9-rc5' into patchwork

Linux 3.9-rc5 * tag 'v3.9-rc5': (1080 commits) Linux 3.9-rc5 Revert "lockdep: check that no locks held at freeze time" dw_dmac: adjust slave_id accordingly to request line base dmaengine: dw_dma: fix endianess for DT xlate function PNP: List Rafael Wysocki as a maintainer rbd: don't zero-fill non-image object requests ia64 idle: delete stale (*idle)() function pointer Btrfs: don't drop path when printing out tree errors in scrub target: Fix RESERVATION_CONFLICT status regression for iscsi-target special case tcm_vhost: Avoid VIRTIO_RING_F_EVENT_IDX feature bit Revert "mm: introduce VM_POPULATE flag to better deal with racy userspace programs" usb: ftdi_sio: Add support for Mitsubishi FX-USB-AW/-BD mg_disk: fix error return code in mg_probe() Btrfs: fix wrong return value of btrfs_lookup_csum() Btrfs: fix wrong reservation of csums Btrfs: fix double free in the btrfs_qgroup_account_ref() Btrfs: limit the global reserve to 512mb Btrfs: hold the ordered operations mutex when waiting on ordered extents Btrfs: fix space accounting for unlink and rename Btrfs: fix space leak when we fail to reserve metadata space ...

Mauro Carvalho Chehab committed 13 years ago

Commit f9f11df2 parents 6bf7861 07961ac1122 files · +12783 −6045Browse files

Showing the changes to include/uapi (6 of 1122 files). Show all

Unified · Split

6 files
  1. include/uapi/linux/acct.h +4 −2
  2. include/uapi/linux/aio_abi.h +2 −2
  3. include/uapi/linux/packet_diag.h +3 −1
  4. include/uapi/linux/raid/md_p.h +4 −2
  5. include/uapi/linux/serial_core.h +4 −1
  6. include/uapi/linux/unix_diag.h +3 −1
include/uapi/linux/acct.h+4−2
@@ -107,10 +107,12 @@ struct acct_v3 · 106 unmodified lines
107#define ACORE 0x08 /* ... dumped core */107#define ACORE 0x08 /* ... dumped core */
108#define AXSIG 0x10 /* ... was killed by a signal */108#define AXSIG 0x10 /* ... was killed by a signal */
109 109
110#ifdef __BIG_ENDIAN110#if defined(__BYTE_ORDER) ? __BYTE_ORDER == __BIG_ENDIAN : defined(__BIG_ENDIAN)
111#define ACCT_BYTEORDER 0x80 /* accounting file is big endian */111#define ACCT_BYTEORDER 0x80 /* accounting file is big endian */
112#else112#elif defined(__BYTE_ORDER) ? __BYTE_ORDER == __LITTLE_ENDIAN : defined(__LITTLE_ENDIAN)
113#define ACCT_BYTEORDER 0x00 /* accounting file is little endian */113#define ACCT_BYTEORDER 0x00 /* accounting file is little endian */
114#else
115#error unspecified endianness
114#endif116#endif
115 117
116#ifndef __KERNEL__118#ifndef __KERNEL__
include/uapi/linux/aio_abi.h+2−2
@@ -62,9 +62,9 @@ struct io_event { · 61 unmodified lines
62 __s64 res2; /* secondary result */62 __s64 res2; /* secondary result */
63};63};
64 64
65#if defined(__LITTLE_ENDIAN)65#if defined(__BYTE_ORDER) ? __BYTE_ORDER == __LITTLE_ENDIAN : defined(__LITTLE_ENDIAN)
66#define PADDED(x,y) x, y66#define PADDED(x,y) x, y
67#elif defined(__BIG_ENDIAN)67#elif defined(__BYTE_ORDER) ? __BYTE_ORDER == __BIG_ENDIAN : defined(__BIG_ENDIAN)
68#define PADDED(x,y) y, x68#define PADDED(x,y) y, x
69#else69#else
70#error edit for your odd byteorder.70#error edit for your odd byteorder.
include/uapi/linux/packet_diag.h+3−1
@@ -33,9 +33,11 @@ enum { · 32 unmodified lines
33 PACKET_DIAG_TX_RING,33 PACKET_DIAG_TX_RING,
34 PACKET_DIAG_FANOUT,34 PACKET_DIAG_FANOUT,
35 35
36 PACKET_DIAG_MAX,36 __PACKET_DIAG_MAX,
37};37};
38 38
39#define PACKET_DIAG_MAX (__PACKET_DIAG_MAX - 1)
40
39struct packet_diag_info {41struct packet_diag_info {
40 __u32 pdi_index;42 __u32 pdi_index;
41 __u32 pdi_version;43 __u32 pdi_version;
include/uapi/linux/raid/md_p.h+4−2
@@ -145,16 +145,18 @@ typedef struct mdp_superblock_s { · 144 unmodified lines
145 __u32 failed_disks; /* 4 Number of failed disks */145 __u32 failed_disks; /* 4 Number of failed disks */
146 __u32 spare_disks; /* 5 Number of spare disks */146 __u32 spare_disks; /* 5 Number of spare disks */
147 __u32 sb_csum; /* 6 checksum of the whole superblock */147 __u32 sb_csum; /* 6 checksum of the whole superblock */
148#ifdef __BIG_ENDIAN148#if defined(__BYTE_ORDER) ? __BYTE_ORDER == __BIG_ENDIAN : defined(__BIG_ENDIAN)
149 __u32 events_hi; /* 7 high-order of superblock update count */149 __u32 events_hi; /* 7 high-order of superblock update count */
150 __u32 events_lo; /* 8 low-order of superblock update count */150 __u32 events_lo; /* 8 low-order of superblock update count */
151 __u32 cp_events_hi; /* 9 high-order of checkpoint update count */151 __u32 cp_events_hi; /* 9 high-order of checkpoint update count */
152 __u32 cp_events_lo; /* 10 low-order of checkpoint update count */152 __u32 cp_events_lo; /* 10 low-order of checkpoint update count */
153#else153#elif defined(__BYTE_ORDER) ? __BYTE_ORDER == __LITTLE_ENDIAN : defined(__LITTLE_ENDIAN)
154 __u32 events_lo; /* 7 low-order of superblock update count */154 __u32 events_lo; /* 7 low-order of superblock update count */
155 __u32 events_hi; /* 8 high-order of superblock update count */155 __u32 events_hi; /* 8 high-order of superblock update count */
156 __u32 cp_events_lo; /* 9 low-order of checkpoint update count */156 __u32 cp_events_lo; /* 9 low-order of checkpoint update count */
157 __u32 cp_events_hi; /* 10 high-order of checkpoint update count */157 __u32 cp_events_hi; /* 10 high-order of checkpoint update count */
158#else
159#error unspecified endianness
158#endif160#endif
159 __u32 recovery_cp; /* 11 recovery checkpoint sector count */161 __u32 recovery_cp; /* 11 recovery checkpoint sector count */
160 /* There are only valid for minor_version > 90 */162 /* There are only valid for minor_version > 90 */
include/uapi/linux/serial_core.h+4−1
@@ -51,7 +51,10 @@ · 50 unmodified lines
51#define PORT_8250_CIR 23 /* CIR infrared port, has its own driver */51#define PORT_8250_CIR 23 /* CIR infrared port, has its own driver */
52#define PORT_XR17V35X 24 /* Exar XR17V35x UARTs */52#define PORT_XR17V35X 24 /* Exar XR17V35x UARTs */
53#define PORT_BRCM_TRUMANAGE 2553#define PORT_BRCM_TRUMANAGE 25
54#define PORT_MAX_8250 25 /* max port ID */54#define PORT_ALTR_16550_F32 26 /* Altera 16550 UART with 32 FIFOs */
55#define PORT_ALTR_16550_F64 27 /* Altera 16550 UART with 64 FIFOs */
56#define PORT_ALTR_16550_F128 28 /* Altera 16550 UART with 128 FIFOs */
57#define PORT_MAX_8250 28 /* max port ID */
55 58
56/*59/*
57 * ARM specific type numbers. These are not currently guaranteed60 * ARM specific type numbers. These are not currently guaranteed
include/uapi/linux/unix_diag.h+3−1
@@ -39,9 +39,11 @@ enum { · 38 unmodified lines
39 UNIX_DIAG_MEMINFO,39 UNIX_DIAG_MEMINFO,
40 UNIX_DIAG_SHUTDOWN,40 UNIX_DIAG_SHUTDOWN,
41 41
42 UNIX_DIAG_MAX,42 __UNIX_DIAG_MAX,
43};43};
44 44
45#define UNIX_DIAG_MAX (__UNIX_DIAG_MAX - 1)
46
45struct unix_diag_vfs {47struct unix_diag_vfs {
46 __u32 udiag_vfs_ino;48 __u32 udiag_vfs_ino;
47 __u32 udiag_vfs_dev;49 __u32 udiag_vfs_dev;