Commit 74f1456c authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'linux-kselftest-fixes-6.5-rc3' of...

Merge tag 'linux-kselftest-fixes-6.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull Kselftest fixes from Shuah Khan:
 "Fixes to bugs that are interfering with arm64 and risc workflows. Also
  two fixes to timer and mincore tests that are causing test failures"

* tag 'linux-kselftest-fixes-6.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests/arm64: fix build failure during the "emit_tests" step
  selftests/riscv: fix potential build failure during the "emit_tests" step
  tools: timers: fix freq average calculation
  selftests/mincore: fix skip condition for check_huge_pages test
parents f2f393c3 569f8b50
...@@ -42,7 +42,7 @@ run_tests: all ...@@ -42,7 +42,7 @@ run_tests: all
done done
# Avoid any output on non arm64 on emit_tests # Avoid any output on non arm64 on emit_tests
emit_tests: all emit_tests:
@for DIR in $(ARM64_SUBTARGETS); do \ @for DIR in $(ARM64_SUBTARGETS); do \
BUILD_TARGET=$(OUTPUT)/$$DIR; \ BUILD_TARGET=$(OUTPUT)/$$DIR; \
make OUTPUT=$$BUILD_TARGET -C $$DIR $@; \ make OUTPUT=$$BUILD_TARGET -C $$DIR $@; \
......
...@@ -150,8 +150,8 @@ TEST(check_huge_pages) ...@@ -150,8 +150,8 @@ TEST(check_huge_pages)
MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB, MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB,
-1, 0); -1, 0);
if (addr == MAP_FAILED) { if (addr == MAP_FAILED) {
if (errno == ENOMEM) if (errno == ENOMEM || errno == EINVAL)
SKIP(return, "No huge pages available."); SKIP(return, "No huge pages available or CONFIG_HUGETLB_PAGE disabled.");
else else
TH_LOG("mmap error: %s", strerror(errno)); TH_LOG("mmap error: %s", strerror(errno));
} }
......
...@@ -43,7 +43,7 @@ run_tests: all ...@@ -43,7 +43,7 @@ run_tests: all
done done
# Avoid any output on non riscv on emit_tests # Avoid any output on non riscv on emit_tests
emit_tests: all emit_tests:
@for DIR in $(RISCV_SUBTARGETS); do \ @for DIR in $(RISCV_SUBTARGETS); do \
BUILD_TARGET=$(OUTPUT)/$$DIR; \ BUILD_TARGET=$(OUTPUT)/$$DIR; \
$(MAKE) OUTPUT=$$BUILD_TARGET -C $$DIR $@; \ $(MAKE) OUTPUT=$$BUILD_TARGET -C $$DIR $@; \
......
...@@ -129,8 +129,7 @@ int main(int argc, char **argv) ...@@ -129,8 +129,7 @@ int main(int argc, char **argv)
printf("%lld.%i(est)", eppm/1000, abs((int)(eppm%1000))); printf("%lld.%i(est)", eppm/1000, abs((int)(eppm%1000)));
/* Avg the two actual freq samples adjtimex gave us */ /* Avg the two actual freq samples adjtimex gave us */
ppm = (tx1.freq + tx2.freq) * 1000 / 2; ppm = (long long)(tx1.freq + tx2.freq) * 1000 / 2;
ppm = (long long)tx1.freq * 1000;
ppm = shift_right(ppm, 16); ppm = shift_right(ppm, 16);
printf(" %lld.%i(act)", ppm/1000, abs((int)(ppm%1000))); printf(" %lld.%i(act)", ppm/1000, abs((int)(ppm%1000)));
......
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