[GIT PULL] kselftest fixes update for Linux 6.18-rc4

[Shuah Khan <skhan@linuxfoundation.org>]

[-- Attachment #1: Type: text/plain, Size: 1383 bytes --]

Hi Linus,

Please pull the following kselftest fixes update for Linux 6.18-rc4.

Fixes build warning in cachestat found during clang build and adds
tmpshmcstat to .gitignore.

diff is attached.

thanks,
-- Shuah

----------------------------------------------------------------
The following changes since commit 3a8660878839faadb4f1a6dd72c3179c1df56787:

   Linux 6.18-rc1 (2025-10-12 13:42:36 -0700)

are available in the Git repository at:

   git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux_kselftest-fixes-6.18-rc4

for you to fetch changes up to 920aa3a7705a061cb3004572d8b7932b54463dbf:

   selftests: cachestat: Fix warning on declaration under label (2025-10-22 09:23:18 -0600)

----------------------------------------------------------------
linux_kselftest-fixes-6.18-rc4

Fixes build warning in cachestat found during clang build and adds
tmpshmcstat to .gitignore.

----------------------------------------------------------------
Madhur Kumar (1):
       selftests/cachestat: add tmpshmcstat file to .gitignore

Sidharth Seela (1):
       selftests: cachestat: Fix warning on declaration under label

  tools/testing/selftests/cachestat/.gitignore       | 1 +
  tools/testing/selftests/cachestat/test_cachestat.c | 4 ++--
  2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------

[-- Attachment #2: linux_kselftest-fixes-6.18-rc4.diff --]
[-- Type: text/x-patch, Size: 1172 bytes --]

diff --git a/tools/testing/selftests/cachestat/.gitignore b/tools/testing/selftests/cachestat/.gitignore
index d6c30b43a4bb..abbb13b6e96b 100644
--- a/tools/testing/selftests/cachestat/.gitignore
+++ b/tools/testing/selftests/cachestat/.gitignore
@@ -1,2 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0-only
 test_cachestat
+tmpshmcstat
diff --git a/tools/testing/selftests/cachestat/test_cachestat.c b/tools/testing/selftests/cachestat/test_cachestat.c
index c952640f163b..ab838bcb9ec5 100644
--- a/tools/testing/selftests/cachestat/test_cachestat.c
+++ b/tools/testing/selftests/cachestat/test_cachestat.c
@@ -226,7 +226,7 @@ bool run_cachestat_test(enum file_type type)
 	int syscall_ret;
 	size_t compute_len = PS * 512;
 	struct cachestat_range cs_range = { PS, compute_len };
-	char *filename = "tmpshmcstat";
+	char *filename = "tmpshmcstat", *map;
 	struct cachestat cs;
 	bool ret = true;
 	int fd;
@@ -257,7 +257,7 @@ bool run_cachestat_test(enum file_type type)
 		}
 		break;
 	case FILE_MMAP:
-		char *map = mmap(NULL, filesize, PROT_READ | PROT_WRITE,
+		map = mmap(NULL, filesize, PROT_READ | PROT_WRITE,
 				 MAP_SHARED, fd, 0);
 
 		if (map == MAP_FAILED) {