diff options
author | 2020-10-04 12:19:12 +0200 | |
---|---|---|
committer | 2020-10-04 12:19:12 +0200 | |
commit | 463c43fcd97e493d8a17242f4f000c86fe642ed6 (patch) | |
tree | 95deff935b99d5ef6c87bd67b7f7be608a120951 /tools/io_uring/io_uring-bench.c | |
parent | media: add Zoran cardlist (diff) | |
parent | Linux 5.9-rc7 (diff) | |
download | linux-463c43fcd97e493d8a17242f4f000c86fe642ed6.tar.gz linux-463c43fcd97e493d8a17242f4f000c86fe642ed6.tar.bz2 linux-463c43fcd97e493d8a17242f4f000c86fe642ed6.zip |
Merge tag 'v5.9-rc7' into patchwork
Linux 5.9-rc7
* tag 'v5.9-rc7': (683 commits)
Linux 5.9-rc7
mm/thp: Split huge pmds/puds if they're pinned when fork()
mm: Do early cow for pinned pages during fork() for ptes
mm/fork: Pass new vma pointer into copy_page_range()
mm: Introduce mm_struct.has_pinned
mm: validate pmd after splitting
mm: don't rely on system state to detect hot-plug operations
mm: replace memmap_context by meminit_context
arch/x86/lib/usercopy_64.c: fix __copy_user_flushcache() cache writeback
lib/memregion.c: include memregion.h
lib/string.c: implement stpcpy
mm/migrate: correct thp migration stats
mm/gup: fix gup_fast with dynamic page table folding
mm: memcontrol: fix missing suffix of workingset_restore
mm, THP, swap: fix allocating cluster for swapfile by mistake
mm: slab: fix potential double free in ___cache_free
Documentation/llvm: Fix clang target examples
io_uring: ensure async buffered read-retry is setup properly
KVM: SVM: Add a dedicated INVD intercept routine
io_uring: don't unconditionally set plug->nowait = true
...
Diffstat (limited to 'tools/io_uring/io_uring-bench.c')
-rw-r--r-- | tools/io_uring/io_uring-bench.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/io_uring/io_uring-bench.c b/tools/io_uring/io_uring-bench.c index 0f257139b003..7703f0118385 100644 --- a/tools/io_uring/io_uring-bench.c +++ b/tools/io_uring/io_uring-bench.c @@ -130,7 +130,7 @@ static int io_uring_register_files(struct submitter *s) s->nr_files); } -static int gettid(void) +static int lk_gettid(void) { return syscall(__NR_gettid); } @@ -281,7 +281,7 @@ static void *submitter_fn(void *data) struct io_sq_ring *ring = &s->sq_ring; int ret, prepped; - printf("submitter=%d\n", gettid()); + printf("submitter=%d\n", lk_gettid()); srand48_r(pthread_self(), &s->rand); |