From bdcbc371eeb2f52effad85040b28c9ae2c1648bb Mon Sep 17 00:00:00 2001
From: Robbin Ehn <rehn@rivosinc.com>
Date: Fri, 24 Jan 2025 12:00:34 +0100
Subject: [PATCH] Rename

---
 src/hotspot/os/linux/os_linux.cpp             | 20 +++++++++----------
 src/hotspot/os/linux/os_linux.hpp             |  6 +++---
 .../os/linux/systemMemoryBarrier_linux.cpp    |  8 ++++----
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp
index 7a508ee760c42..f21b20eb81537 100644
--- a/src/hotspot/os/linux/os_linux.cpp
+++ b/src/hotspot/os/linux/os_linux.cpp
@@ -378,10 +378,10 @@ static void next_line(FILE *f) {
   } while (c != '\n' && c != EOF);
 }
 
-void os::Linux::kernel_version(long* major, long* patch, long* sub) {
+void os::Linux::kernel_version(long* major, long* minor, long* patch) {
   *major = -1;
+  *minor = -1;
   *patch = -1;
-  *sub   = -1;
 
   struct utsname buffer;
   int ret = uname(&buffer);
@@ -389,26 +389,26 @@ void os::Linux::kernel_version(long* major, long* patch, long* sub) {
     log_warning(os)("uname(2) failed to get kernel version: %s", os::errno_name(ret));
     return;
   }
-  int nr_matched = sscanf(buffer.release, "%ld.%ld.%ld", major, patch, sub);
+  int nr_matched = sscanf(buffer.release, "%ld.%ld.%ld", major, minor, patch);
   if (nr_matched != 3) {
     log_warning(os)("Parsing kernel version failed, expected 3 version numbers, only matched %d", nr_matched);
   }
 }
 
-int os::Linux::kernel_version_compare(long major1, long patch1, long sub1,
-                                      long major2, long patch2, long sub2) {
+int os::Linux::kernel_version_compare(long major1, long minor1, long patch1,
+                                      long major2, long minor2, long patch2) {
   // Compare major versions
   if (major1 > major2) return 1;
   if (major1 < major2) return -1;
 
-  // Compare patch versions
+  // Compare minor versions
+  if (minor1 > minor2) return 1;
+  if (minor1 < minor2) return -1;
+
+  // Compare patchlevel versions
   if (patch1 > patch2) return 1;
   if (patch1 < patch2) return -1;
 
-  // Compare sublevel versions
-  if (sub1 > sub2) return 1;
-  if (sub1 < sub2) return -1;
-
   return 0;
 }
 
diff --git a/src/hotspot/os/linux/os_linux.hpp b/src/hotspot/os/linux/os_linux.hpp
index 0ae1b49373f18..bd2e1ea323048 100644
--- a/src/hotspot/os/linux/os_linux.hpp
+++ b/src/hotspot/os/linux/os_linux.hpp
@@ -91,13 +91,13 @@ class os::Linux {
   };
 
   static int active_processor_count();
-  static void kernel_version(long* major, long* patch, long* sub);
+  static void kernel_version(long* major, long* minor, long* patch);
 
   // If kernel1 > kernel2 return  1
   // If kernel1 < kernel2 return -1
   // If kernel1 = kernel2 return  0
-  static int kernel_version_compare(long major1, long patch1, long sub1,
-                                    long major2, long patch2, long sub2);
+  static int kernel_version_compare(long major1, long minor1, long patch1,
+                                    long major2, long minor2, long patch2);
 
   // which_logical_cpu=-1 returns accumulated ticks for all cpus.
   static bool get_tick_information(CPUPerfTicks* pticks, int which_logical_cpu);
diff --git a/src/hotspot/os/linux/systemMemoryBarrier_linux.cpp b/src/hotspot/os/linux/systemMemoryBarrier_linux.cpp
index cd39bff137829..766bb70a97710 100644
--- a/src/hotspot/os/linux/systemMemoryBarrier_linux.cpp
+++ b/src/hotspot/os/linux/systemMemoryBarrier_linux.cpp
@@ -66,11 +66,11 @@ bool LinuxSystemMemoryBarrier::initialize() {
 // RISCV port was introduced in kernel 4.4.
 // 4.4 also made membar private expedited mandatory.
 // But RISCV actually don't support it until 6.9.
-  long major, patch, sub;
-  os::Linux::kernel_version(&major, &patch, &sub);
-  if (os::Linux::kernel_version_compare(major, patch, sub, 6, 9, 0) == -1) {
+  long major, minor, patch;
+  os::Linux::kernel_version(&major, &minor, &patch);
+  if (os::Linux::kernel_version_compare(major, minor, patch, 6, 9, 0) == -1) {
     log_info(os)("Linux kernel %ld.%ld.%ld does not support MEMBARRIER PRIVATE_EXPEDITED on RISC-V.",
-                 major, patch, sub);
+                 major, minor, patch);
     return false;
   }
 #endif