Commit 07d2505b authored by Shuah Khan's avatar Shuah Khan Committed by Linus Torvalds

kselftest/vm: revert "tools/testing/selftests/vm/userfaultfd.c: use swap() to make code cleaner"

With this change, userfaultfd fails to build with undefined reference
swap() error:

  userfaultfd.c: In function `userfaultfd_stress':
  userfaultfd.c:1530:17: warning: implicit declaration of function `swap'; did you mean `swab'? [-Wimplicit-function-declaration]
   1530 |                 swap(area_src, area_dst);
        |                 ^~~~
        |                 swab
  /usr/bin/ld: /tmp/ccDGOAdV.o: in function `userfaultfd_stress':
  userfaultfd.c:(.text+0x549e): undefined reference to `swap'
  /usr/bin/ld: userfaultfd.c:(.text+0x54bc): undefined reference to `swap'
  collect2: error: ld returned 1 exit status

Revert the commit to fix the problem.

Link: https://lkml.kernel.org/r/20220202003340.87195-1-skhan@linuxfoundation.org
Fixes: 2c769ed7 ("tools/testing/selftests/vm/userfaultfd.c: use swap() to make code cleaner")
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
Cc: Shuah Khan <shuah@kernel.org>
Cc: Minghao Chi <chi.minghao@zte.com.cn>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6a0fb704
...@@ -1417,6 +1417,7 @@ static void userfaultfd_pagemap_test(unsigned int test_pgsize) ...@@ -1417,6 +1417,7 @@ static void userfaultfd_pagemap_test(unsigned int test_pgsize)
static int userfaultfd_stress(void) static int userfaultfd_stress(void)
{ {
void *area; void *area;
char *tmp_area;
unsigned long nr; unsigned long nr;
struct uffdio_register uffdio_register; struct uffdio_register uffdio_register;
struct uffd_stats uffd_stats[nr_cpus]; struct uffd_stats uffd_stats[nr_cpus];
...@@ -1527,9 +1528,13 @@ static int userfaultfd_stress(void) ...@@ -1527,9 +1528,13 @@ static int userfaultfd_stress(void)
count_verify[nr], nr); count_verify[nr], nr);
/* prepare next bounce */ /* prepare next bounce */
swap(area_src, area_dst); tmp_area = area_src;
area_src = area_dst;
area_dst = tmp_area;
swap(area_src_alias, area_dst_alias); tmp_area = area_src_alias;
area_src_alias = area_dst_alias;
area_dst_alias = tmp_area;
uffd_stats_report(uffd_stats, nr_cpus); uffd_stats_report(uffd_stats, nr_cpus);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment