Skip to contentSkip to conversation

selftests/mm: mkdirty: Fix incorrect position of #endif

PATCH Applied Colin Ian King 2 participants 2 messages Jul 12, 2023

Subsystems (4)
Memory management Kselftest Kernel janitors MM misc
lore
Share & tools
lore

Colin Ian King

author
#0 lore raw

PATCH 1/1 selftests/mm: mkdirty: Fix incorrect position of #endif

The #endif is the wrong side of a } causing a build failure when __NR_userfaultfd is not defined. Fix this by moving the #end to enclose the }

Fixes 9eac40fc0cc7 ("selftests/mm: mkdirty: test behavior of (pte|pmd)_mkdirty on VMAs without write permissions")
Signed-off-by Colin Ian King <[email protected]>
---
 tools/testing/selftests/mm/mkdirty.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/mm/mkdirty.c +1 -1
index 6d71d972997b..301abb99e027 100644
@@ -321,8 +321,8 @@ static void test_uffdio_copy(void)
 munmap:
 	munmap(dst, pagesize);
 	free(src);
-#endif /* __NR_userfaultfd */
 }
+#endif /* __NR_userfaultfd */
 
 int main(void)
 {
Signature · 1 line
2.39.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 15 lines · Colin Ian King

The #endif is the wrong side of a } causing a build failure when __NR_userfaultfd is not defined. Fix this by moving the #end to enclose the }

Fixes 9eac40fc0cc7 ("selftests/mm: mkdirty: test behavior of (pte|pmd)_mkdirty on VMAs without write permissions")
Signed-off-by Colin Ian King <[email protected]>
---
  tools/testing/selftests/mm/mkdirty.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/mm/mkdirty.c +0 -0
index 6d71d972997b..301abb99e027 100644

tools/testing/selftests/mm/mkdirty.c static void test_uffdio_copy(void) · line 328

Quoted 9 lines
tools/testing/selftests/mm/mkdirty.c +1 -1
@@ -321,8 +321,8 @@ static void test_uffdio_copy(void)
  munmap:
  	munmap(dst, pagesize);
  	free(src);
-#endif /* __NR_userfaultfd */
  }
+#endif /* __NR_userfaultfd */
 
  int main(void)
  {

Ouch, thanks!

Reviewed-by David Hildenbrand <[email protected]>
Signature · 3 lines
Cheers,

David / dhildenb