Skip to content

Commit 9eb8034

Browse files
metze-sambaaxboe
authored andcommitted
uapi:io_uring.h: allow linux/time_types.h to be skipped
include/uapi/linux/io_uring.h is synced 1:1 into liburing:src/include/liburing/io_uring.h. liburing has a configure check to detect the need for linux/time_types.h. It can opt-out by defining UAPI_LINUX_IO_URING_H_SKIP_LINUX_TIME_TYPES_H Fixes: 78a861b ("io_uring: add sync cancelation API through io_uring_register()") Link: axboe/liburing#708 Link: axboe/liburing#709 Link: https://lore.kernel.org/io-uring/[email protected]/T/#m9f5dd571cd4f6a5dee84452dbbca3b92ba7a4091 CC: Jens Axboe <[email protected]> Cc: Ammar Faizi <[email protected]> Signed-off-by: Stefan Metzmacher <[email protected]> Reviewed-by: Ammar Faizi <[email protected]> Link: https://lore.kernel.org/r/7071a0a1d751221538b20b63f9160094fc7e06f4.1668630247.git.metze@samba.org Signed-off-by: Jens Axboe <[email protected]>
1 parent 3431908 commit 9eb8034

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

include/uapi/linux/io_uring.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,15 @@
1010

1111
#include <linux/fs.h>
1212
#include <linux/types.h>
13+
/*
14+
* this file is shared with liburing and that has to autodetect
15+
* if linux/time_types.h is available or not, it can
16+
* define UAPI_LINUX_IO_URING_H_SKIP_LINUX_TIME_TYPES_H
17+
* if linux/time_types.h is not available
18+
*/
19+
#ifndef UAPI_LINUX_IO_URING_H_SKIP_LINUX_TIME_TYPES_H
1320
#include <linux/time_types.h>
21+
#endif
1422

1523
#ifdef __cplusplus
1624
extern "C" {

0 commit comments

Comments
 (0)