History

Merge 3.19-rc5 into tty-next

We want those tty fixes in that release in this branch as well.

Greg Kroah-Hartman committed 11 years ago

Commit 61b6b7f2 parents 4c215fe ec6f34e613 files · +6256 −4336Browse files

Showing the changes to include/uapi/linux (5 of 613 files). Show all

Unified · Split

5 files
  1. include/uapi/linux/in6.h +2 −1
  2. include/uapi/linux/kfd_ioctl.h +22 −15
  3. include/uapi/linux/libc-compat.h +3 −0
  4. include/uapi/linux/openvswitch.h +4 −0
  5. include/uapi/linux/virtio_ring.h +7 −0
include/uapi/linux/in6.h+2−1
@@ -149,7 +149,7 @@ struct in6_flowlabel_req { · 148 unmodified lines
149/*149/*
150 * IPV6 socket options150 * IPV6 socket options
151 */151 */
152 152#if __UAPI_DEF_IPV6_OPTIONS
153#define IPV6_ADDRFORM 1153#define IPV6_ADDRFORM 1
154#define IPV6_2292PKTINFO 2154#define IPV6_2292PKTINFO 2
155#define IPV6_2292HOPOPTS 3155#define IPV6_2292HOPOPTS 3
@@ -196,6 +196,7 @@ struct in6_flowlabel_req { · 40 unmodified lines
196 196
197#define IPV6_IPSEC_POLICY 34197#define IPV6_IPSEC_POLICY 34
198#define IPV6_XFRM_POLICY 35198#define IPV6_XFRM_POLICY 35
199#endif
199 200
200/*201/*
201 * Multicast:202 * Multicast:
include/uapi/linux/kfd_ioctl.h+22−15
@@ -128,27 +128,34 @@ struct kfd_ioctl_get_process_apertures_args { · 127 unmodified lines
128 uint32_t pad;128 uint32_t pad;
129};129};
130 130
131#define KFD_IOC_MAGIC 'K'131#define AMDKFD_IOCTL_BASE 'K'
132#define AMDKFD_IO(nr) _IO(AMDKFD_IOCTL_BASE, nr)
133#define AMDKFD_IOR(nr, type) _IOR(AMDKFD_IOCTL_BASE, nr, type)
134#define AMDKFD_IOW(nr, type) _IOW(AMDKFD_IOCTL_BASE, nr, type)
135#define AMDKFD_IOWR(nr, type) _IOWR(AMDKFD_IOCTL_BASE, nr, type)
132 136
133#define KFD_IOC_GET_VERSION \137#define AMDKFD_IOC_GET_VERSION \
134 _IOR(KFD_IOC_MAGIC, 1, struct kfd_ioctl_get_version_args)138 AMDKFD_IOR(0x01, struct kfd_ioctl_get_version_args)
135 139
136#define KFD_IOC_CREATE_QUEUE \140#define AMDKFD_IOC_CREATE_QUEUE \
137 _IOWR(KFD_IOC_MAGIC, 2, struct kfd_ioctl_create_queue_args)141 AMDKFD_IOWR(0x02, struct kfd_ioctl_create_queue_args)
138 142
139#define KFD_IOC_DESTROY_QUEUE \143#define AMDKFD_IOC_DESTROY_QUEUE \
140 _IOWR(KFD_IOC_MAGIC, 3, struct kfd_ioctl_destroy_queue_args)144 AMDKFD_IOWR(0x03, struct kfd_ioctl_destroy_queue_args)
141 145
142#define KFD_IOC_SET_MEMORY_POLICY \146#define AMDKFD_IOC_SET_MEMORY_POLICY \
143 _IOW(KFD_IOC_MAGIC, 4, struct kfd_ioctl_set_memory_policy_args)147 AMDKFD_IOW(0x04, struct kfd_ioctl_set_memory_policy_args)
144 148
145#define KFD_IOC_GET_CLOCK_COUNTERS \149#define AMDKFD_IOC_GET_CLOCK_COUNTERS \
146 _IOWR(KFD_IOC_MAGIC, 5, struct kfd_ioctl_get_clock_counters_args)150 AMDKFD_IOWR(0x05, struct kfd_ioctl_get_clock_counters_args)
147 151
148#define KFD_IOC_GET_PROCESS_APERTURES \152#define AMDKFD_IOC_GET_PROCESS_APERTURES \
149 _IOR(KFD_IOC_MAGIC, 6, struct kfd_ioctl_get_process_apertures_args)153 AMDKFD_IOR(0x06, struct kfd_ioctl_get_process_apertures_args)
150 154
151#define KFD_IOC_UPDATE_QUEUE \155#define AMDKFD_IOC_UPDATE_QUEUE \
152 _IOW(KFD_IOC_MAGIC, 7, struct kfd_ioctl_update_queue_args)156 AMDKFD_IOW(0x07, struct kfd_ioctl_update_queue_args)
157
158#define AMDKFD_COMMAND_START 0x01
159#define AMDKFD_COMMAND_END 0x08
153 160
154#endif161#endif
include/uapi/linux/libc-compat.h+3−0
@@ -69,6 +69,7 @@ · 68 unmodified lines
69#define __UAPI_DEF_SOCKADDR_IN6 069#define __UAPI_DEF_SOCKADDR_IN6 0
70#define __UAPI_DEF_IPV6_MREQ 070#define __UAPI_DEF_IPV6_MREQ 0
71#define __UAPI_DEF_IPPROTO_V6 071#define __UAPI_DEF_IPPROTO_V6 0
72#define __UAPI_DEF_IPV6_OPTIONS 0
72 73
73#else74#else
74 75
@@ -82,6 +83,7 @@ · 7 unmodified lines
82#define __UAPI_DEF_SOCKADDR_IN6 183#define __UAPI_DEF_SOCKADDR_IN6 1
83#define __UAPI_DEF_IPV6_MREQ 184#define __UAPI_DEF_IPV6_MREQ 1
84#define __UAPI_DEF_IPPROTO_V6 185#define __UAPI_DEF_IPPROTO_V6 1
86#define __UAPI_DEF_IPV6_OPTIONS 1
85 87
86#endif /* _NETINET_IN_H */88#endif /* _NETINET_IN_H */
87 89
@@ -103,6 +105,7 @@ · 15 unmodified lines
103#define __UAPI_DEF_SOCKADDR_IN6 1105#define __UAPI_DEF_SOCKADDR_IN6 1
104#define __UAPI_DEF_IPV6_MREQ 1106#define __UAPI_DEF_IPV6_MREQ 1
105#define __UAPI_DEF_IPPROTO_V6 1107#define __UAPI_DEF_IPPROTO_V6 1
108#define __UAPI_DEF_IPV6_OPTIONS 1
106 109
107/* Definitions for xattr.h */110/* Definitions for xattr.h */
108#define __UAPI_DEF_XATTR 1111#define __UAPI_DEF_XATTR 1
include/uapi/linux/openvswitch.h+4−0
@@ -174,6 +174,10 @@ enum ovs_packet_attr { · 173 unmodified lines
174 OVS_PACKET_ATTR_USERDATA, /* OVS_ACTION_ATTR_USERSPACE arg. */174 OVS_PACKET_ATTR_USERDATA, /* OVS_ACTION_ATTR_USERSPACE arg. */
175 OVS_PACKET_ATTR_EGRESS_TUN_KEY, /* Nested OVS_TUNNEL_KEY_ATTR_*175 OVS_PACKET_ATTR_EGRESS_TUN_KEY, /* Nested OVS_TUNNEL_KEY_ATTR_*
176 attributes. */176 attributes. */
177 OVS_PACKET_ATTR_UNUSED1,
178 OVS_PACKET_ATTR_UNUSED2,
179 OVS_PACKET_ATTR_PROBE, /* Packet operation is a feature probe,
180 error logging should be suppressed. */
177 __OVS_PACKET_ATTR_MAX181 __OVS_PACKET_ATTR_MAX
178};182};
179 183
include/uapi/linux/virtio_ring.h+7−0
@@ -101,6 +101,13 @@ struct vring { · 100 unmodified lines
101 struct vring_used *used;101 struct vring_used *used;
102};102};
103 103
104/* Alignment requirements for vring elements.
105 * When using pre-virtio 1.0 layout, these fall out naturally.
106 */
107#define VRING_AVAIL_ALIGN_SIZE 2
108#define VRING_USED_ALIGN_SIZE 4
109#define VRING_DESC_ALIGN_SIZE 16
110
104/* The standard layout for the ring is a continuous chunk of memory which looks111/* The standard layout for the ring is a continuous chunk of memory which looks
105 * like this. We assume num is a power of 2.112 * like this. We assume num is a power of 2.
106 *113 *

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t