Skip to content

Commit

Permalink
uapi:io_uring.h: allow linux/time_types.h to be skipped
Browse files Browse the repository at this point in the history
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/20221115212614.1308132-1-ammar.faizi@intel.com/T/#m9f5dd571cd4f6a5dee84452dbbca3b92ba7a4091
CC: Jens Axboe <axboe@kernel.dk>
Cc: Ammar Faizi <ammarfaizi2@gnuweeb.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ammar Faizi <ammarfaizi2@gnuweeb.org>
Link: https://lore.kernel.org/r/7071a0a1d751221538b20b63f9160094fc7e06f4.1668630247.git.metze@samba.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
  • Loading branch information
metze-samba authored and axboe committed Dec 27, 2022
1 parent 3431908 commit 9eb8034
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions include/uapi/linux/io_uring.h
Expand Up @@ -10,7 +10,15 @@

#include <linux/fs.h>
#include <linux/types.h>
/*
* this file is shared with liburing and that has to autodetect
* if linux/time_types.h is available or not, it can
* define UAPI_LINUX_IO_URING_H_SKIP_LINUX_TIME_TYPES_H
* if linux/time_types.h is not available
*/
#ifndef UAPI_LINUX_IO_URING_H_SKIP_LINUX_TIME_TYPES_H
#include <linux/time_types.h>
#endif

#ifdef __cplusplus
extern "C" {
Expand Down

0 comments on commit 9eb8034

Please sign in to comment.