[PATCH 0/2] selftests/vm: minor fixes for 5.7-rc5

[PATCH 0/2] selftests/vm: minor fixes for 5.7-rc5

[John Hubbard]

Here's a couple of tiny fixes, just so we can cleanly build
selftests/vm. These apply to today's linux.git. Some merge notes:

* The .gitignore fix is appropriate for linux.git, but it is a subset of
  what's required for linux-next and mmotm. In order to fix things now
  in linux.git, and keep it fixed in mmotm and linux-next, but without
  manual intervention required in git merges, I'm adding the missing
  item ("mremap_dontunmap") to the *top* of .gitignore for this patch.
  And then I'll send a separate patch to be applied to mmotm and
  linux-next, that will also add a different item ("khugepaged") to the
  *bottom* of .gitignore.

* The write_to_hugetlbfs.c fix is already applied to linux-next, but
  doesn't seem to be getting picked up for linux.git. Maybe it's in
  the merge pipeline, but if not, let's fix it here, before the -rc
  cycle is over.

John Hubbard (2):
  selftests/vm/write_to_hugetlbfs.c: fix unused variable warning
  selftests/vm/.gitignore: add mremap_dontunmap

 tools/testing/selftests/vm/.gitignore           | 1 +
 tools/testing/selftests/vm/write_to_hugetlbfs.c | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)


base-commit: 3d1c1e5931ce45b3a3f309385bbc00c78e9951c6
-- 
2.26.2

[PATCH 1/2] selftests/vm/write_to_hugetlbfs.c: fix unused variable warning

[John Hubbard]

Remove unused variable "i", which was triggering a compiler warning.

Fixes: 29750f71a9b4 ("hugetlb_cgroup: add hugetlb_cgroup reservation tests")
Cc: Mina Almasry <almasrymina@google.com>
Signed-off-by: John Hubbard <jhubbard@nvidia.com>
---
 tools/testing/selftests/vm/write_to_hugetlbfs.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tools/testing/selftests/vm/write_to_hugetlbfs.c b/tools/testing/selftests/vm/write_to_hugetlbfs.c
index 110bc4e4015d..6a2caba19ee1 100644
--- a/tools/testing/selftests/vm/write_to_hugetlbfs.c
+++ b/tools/testing/selftests/vm/write_to_hugetlbfs.c
@@ -74,8 +74,6 @@ int main(int argc, char **argv)
 	int write = 0;
 	int reserve = 1;
 
-	unsigned long i;
-
 	if (signal(SIGINT, sig_handler) == SIG_ERR)
 		err(1, "\ncan't catch SIGINT\n");
 
-- 
2.26.2

Re: [PATCH 1/2] selftests/vm/write_to_hugetlbfs.c: fix unused variable warning

[Mina Almasry]

On Sat, May 16, 2020 at 5:12 PM John Hubbard <jhubbard@nvidia.com> wrote:
>
> Remove unused variable "i", which was triggering a compiler warning.
>
> Fixes: 29750f71a9b4 ("hugetlb_cgroup: add hugetlb_cgroup reservation tests")
> Cc: Mina Almasry <almasrymina@google.com>
> Signed-off-by: John Hubbard <jhubbard@nvidia.com>
> ---
>  tools/testing/selftests/vm/write_to_hugetlbfs.c | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/tools/testing/selftests/vm/write_to_hugetlbfs.c b/tools/testing/selftests/vm/write_to_hugetlbfs.c
> index 110bc4e4015d..6a2caba19ee1 100644
> --- a/tools/testing/selftests/vm/write_to_hugetlbfs.c
> +++ b/tools/testing/selftests/vm/write_to_hugetlbfs.c
> @@ -74,8 +74,6 @@ int main(int argc, char **argv)
>         int write = 0;
>         int reserve = 1;
>
> -       unsigned long i;
> -
>         if (signal(SIGINT, sig_handler) == SIG_ERR)
>                 err(1, "\ncan't catch SIGINT\n");
>
> --
> 2.26.2
>

Thanks John!

Reviewed-By: Mina Almasry <almasrymina@google.com>

[PATCH 2/2] selftests/vm/.gitignore: add mremap_dontunmap

[John Hubbard]

Add mremap_dontunmap to .gitignore.

Fixes: 0c28759ee3c9 ("selftests: add MREMAP_DONTUNMAP selftest")
Cc: Brian Geffon <bgeffon@google.com>
Signed-off-by: John Hubbard <jhubbard@nvidia.com>
---
 tools/testing/selftests/vm/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/testing/selftests/vm/.gitignore b/tools/testing/selftests/vm/.gitignore
index 0edb6d900e8d..1f332f1f7077 100644
--- a/tools/testing/selftests/vm/.gitignore
+++ b/tools/testing/selftests/vm/.gitignore
@@ -1,4 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-only
+mremap_dontunmap
 hugepage-mmap
 hugepage-shm
 map_hugetlb
-- 
2.26.2