Commit d1271768 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux_kselftest-fixes-6.18-rc4' of... 

Merge tag 'linux_kselftest-fixes-6.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull kselftest fixes from Shuah Khan:
 "Fix build warning in cachestat found during clang build and add
  tmpshmcstat to .gitignore"

* tag 'linux_kselftest-fixes-6.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests: cachestat: Fix warning on declaration under label
  selftests/cachestat: add tmpshmcstat file to .gitignore
parents 18068386 920aa3a7

tools/testing/selftests/cachestat/.gitignore

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

test_cachestat

tmpshmcstat

tools/testing/selftests/cachestat/test_cachestat.c

+2 −2
Original line number Diff line number Diff line
@@ -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) {