History

Merge branch 'topic/line6' into for-next

Takashi Iwai committed 11 years ago

Commit 7bfb8572 parents 6c869d3 61864d8223 files · +2480 −1774Browse files

Showing the changes to include/uapi (2 of 223 files). Show all

Unified · Split

2 files
  1. include/uapi/asm-generic/fcntl.h +1 −1
  2. include/uapi/linux/kfd_ioctl.h +22 −15
include/uapi/asm-generic/fcntl.h+1−1
@@ -5,7 +5,7 @@ · 4 unmodified lines
55
66 /*
77 * FMODE_EXEC is 0x20
8− * FMODE_NONOTIFY is 0x1000000
8+ * FMODE_NONOTIFY is 0x4000000
99 * These cannot be used by userspace O_* until internal and external open
1010 * flags are split.
1111 * -Eric Paris
include/uapi/linux/kfd_ioctl.h+22−15
@@ -128,27 +128,34 @@ struct kfd_ioctl_get_process_apertures_args { · 127 unmodified lines
128128 uint32_t pad;
129129 };
130130
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)
132136
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)
135139
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)
138142
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)
141145
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)
144148
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)
147151
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)
150154
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
153160
154161 #endif

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