History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

David S. Miller committed 8 years ago

Commit 2b9b7502 parents 9206eb0 ccda4af275 files · +3148 −1202Browse files

Showing the changes to include/uapi/linux (1 of 275 files). Show all

Unified · Split

include/uapi/linux/kfd_ioctl.h+9−9
@@ -83,11 +83,11 @@ struct kfd_ioctl_set_cu_mask_args { · 82 unmodified lines
83};83};
84 84
85struct kfd_ioctl_get_queue_wave_state_args {85struct kfd_ioctl_get_queue_wave_state_args {
86 uint64_t ctl_stack_address; /* to KFD */86 __u64 ctl_stack_address; /* to KFD */
87 uint32_t ctl_stack_used_size; /* from KFD */87 __u32 ctl_stack_used_size; /* from KFD */
88 uint32_t save_area_used_size; /* from KFD */88 __u32 save_area_used_size; /* from KFD */
89 uint32_t queue_id; /* to KFD */89 __u32 queue_id; /* to KFD */
90 uint32_t pad;90 __u32 pad;
91};91};
92 92
93/* For kfd_ioctl_set_memory_policy_args.default_policy and alternate_policy */93/* For kfd_ioctl_set_memory_policy_args.default_policy and alternate_policy */
@@ -255,10 +255,10 @@ struct kfd_hsa_memory_exception_data { · 161 unmodified lines
255 255
256/* hw exception data */256/* hw exception data */
257struct kfd_hsa_hw_exception_data {257struct kfd_hsa_hw_exception_data {
258 uint32_t reset_type;258 __u32 reset_type;
259 uint32_t reset_cause;259 __u32 reset_cause;
260 uint32_t memory_lost;260 __u32 memory_lost;
261 uint32_t gpu_id;261 __u32 gpu_id;
262};262};
263 263
264/* Event data */264/* Event data */