Conflicts: drivers/net/xen-netfront.c Minor overlapping changes in xen-netfront.c, mostly to do with some buffer management changes alongside the split of stats into TX and RX.
Showing the changes to include/uapi/linux (2 of 268 files). Show all
Unified · Split
| @@ -128,27 +128,34 @@ struct kfd_ioctl_get_process_apertures_args { · 127 unmodified lines | ||
| 128 | 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 \ | |
| 134 | − _IOR(KFD_IOC_MAGIC, 1, struct kfd_ioctl_get_version_args) | |
| 137 | +#define AMDKFD_IOC_GET_VERSION \ | |
| 138 | + AMDKFD_IOR(0x01, struct kfd_ioctl_get_version_args) | |
| 135 | 139 | |
| 136 | −#define KFD_IOC_CREATE_QUEUE \ | |
| 137 | − _IOWR(KFD_IOC_MAGIC, 2, struct kfd_ioctl_create_queue_args) | |
| 140 | +#define AMDKFD_IOC_CREATE_QUEUE \ | |
| 141 | + AMDKFD_IOWR(0x02, struct kfd_ioctl_create_queue_args) | |
| 138 | 142 | |
| 139 | −#define KFD_IOC_DESTROY_QUEUE \ | |
| 140 | − _IOWR(KFD_IOC_MAGIC, 3, struct kfd_ioctl_destroy_queue_args) | |
| 143 | +#define AMDKFD_IOC_DESTROY_QUEUE \ | |
| 144 | + AMDKFD_IOWR(0x03, struct kfd_ioctl_destroy_queue_args) | |
| 141 | 145 | |
| 142 | −#define KFD_IOC_SET_MEMORY_POLICY \ | |
| 143 | − _IOW(KFD_IOC_MAGIC, 4, struct kfd_ioctl_set_memory_policy_args) | |
| 146 | +#define AMDKFD_IOC_SET_MEMORY_POLICY \ | |
| 147 | + AMDKFD_IOW(0x04, struct kfd_ioctl_set_memory_policy_args) | |
| 144 | 148 | |
| 145 | −#define KFD_IOC_GET_CLOCK_COUNTERS \ | |
| 146 | − _IOWR(KFD_IOC_MAGIC, 5, struct kfd_ioctl_get_clock_counters_args) | |
| 149 | +#define AMDKFD_IOC_GET_CLOCK_COUNTERS \ | |
| 150 | + AMDKFD_IOWR(0x05, struct kfd_ioctl_get_clock_counters_args) | |
| 147 | 151 | |
| 148 | −#define KFD_IOC_GET_PROCESS_APERTURES \ | |
| 149 | − _IOR(KFD_IOC_MAGIC, 6, struct kfd_ioctl_get_process_apertures_args) | |
| 152 | +#define AMDKFD_IOC_GET_PROCESS_APERTURES \ | |
| 153 | + AMDKFD_IOR(0x06, struct kfd_ioctl_get_process_apertures_args) | |
| 150 | 154 | |
| 151 | −#define KFD_IOC_UPDATE_QUEUE \ | |
| 152 | − _IOW(KFD_IOC_MAGIC, 7, struct kfd_ioctl_update_queue_args) | |
| 155 | +#define AMDKFD_IOC_UPDATE_QUEUE \ | |
| 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 | 161 | #endif |
| @@ -174,6 +174,10 @@ enum ovs_packet_attr { · 173 unmodified lines | ||
| 174 | 174 | OVS_PACKET_ATTR_USERDATA, /* OVS_ACTION_ATTR_USERSPACE arg. */ |
| 175 | 175 | OVS_PACKET_ATTR_EGRESS_TUN_KEY, /* Nested OVS_TUNNEL_KEY_ATTR_* |
| 176 | 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 | 181 | __OVS_PACKET_ATTR_MAX |
| 178 | 182 | }; |
| 179 | 183 | |