--- old/src/java.base/linux/classes/jdk/internal/platform/cgroupv2/CgroupV2Subsystem.java	2020-01-21 20:26:20.565270977 +0100
+++ new/src/java.base/linux/classes/jdk/internal/platform/cgroupv2/CgroupV2Subsystem.java	2020-01-21 20:26:20.420270651 +0100
@@ -34,7 +34,6 @@
 import jdk.internal.platform.CgroupSubsystem;
 import jdk.internal.platform.CgroupSubsystemController;
 import jdk.internal.platform.CgroupUtil;
-import jdk.internal.platform.Metrics;
 
 public class CgroupV2Subsystem implements CgroupSubsystem {
 
@@ -96,12 +95,12 @@
         String cpuMaxRaw = CgroupSubsystemController.getStringValue(unified, "cpu.max");
         if (cpuMaxRaw == null) {
             // likely file not found
-            return Metrics.LONG_RETVAL_UNLIMITED;
+            return CgroupSubsystem.LONG_RETVAL_UNLIMITED;
         }
         // $MAX $PERIOD
         String[] tokens = cpuMaxRaw.split("\\s+");
         if (tokens.length != 2) {
-            return Metrics.LONG_RETVAL_UNLIMITED;
+            return CgroupSubsystem.LONG_RETVAL_UNLIMITED;
         }
         String quota = tokens[tokenIdx];
         return limitFromString(quota);
@@ -109,7 +108,7 @@
 
     private long limitFromString(String strVal) {
         if (MAX_VAL.equals(strVal)) {
-            return Metrics.LONG_RETVAL_UNLIMITED;
+            return CgroupSubsystem.LONG_RETVAL_UNLIMITED;
         }
         return Long.parseLong(strVal);
     }
@@ -118,7 +117,7 @@
     public long getCpuShares() {
         long sharesRaw = getLongVal("cpu.weight");
         if (sharesRaw == 100 || sharesRaw == 0) {
-            return Metrics.LONG_RETVAL_UNLIMITED;
+            return CgroupSubsystem.LONG_RETVAL_UNLIMITED;
         }
         int shares = (int)sharesRaw;
         // CPU shares (OCI) value needs to get translated into
@@ -193,16 +192,6 @@
     }
 
     @Override
-    public double getCpuSetMemoryPressure() {
-        return Metrics.DOUBLE_RETVAL_NOT_SUPPORTED;
-    }
-
-    @Override
-    public Boolean isCpuSetMemoryPressureEnabled() {
-        return Metrics.BOOL_RETVAL_NOT_SUPPORTED;
-    }
-
-    @Override
     public long getMemoryFailCount() {
         return CgroupSubsystemController.getLongEntry(unified, "memory.events", "max");
     }
@@ -214,82 +203,27 @@
     }
 
     @Override
-    public long getMemoryMaxUsage() {
-        return Metrics.LONG_RETVAL_NOT_SUPPORTED;
-    }
-
-    @Override
     public long getMemoryUsage() {
         return getLongVal("memory.current");
     }
 
     @Override
-    public long getKernelMemoryFailCount() {
-        return Metrics.LONG_RETVAL_NOT_SUPPORTED;
-    }
-
-    @Override
-    public long getKernelMemoryLimit() {
-        return Metrics.LONG_RETVAL_NOT_SUPPORTED;
-    }
-
-    @Override
-    public long getKernelMemoryMaxUsage() {
-        return Metrics.LONG_RETVAL_NOT_SUPPORTED;
-    }
-
-    @Override
-    public long getKernelMemoryUsage() {
-        return Metrics.LONG_RETVAL_NOT_SUPPORTED;
-    }
-
-    @Override
-    public long getTcpMemoryFailCount() {
-        return Metrics.LONG_RETVAL_NOT_SUPPORTED;
-    }
-
-    @Override
-    public long getTcpMemoryLimit() {
-        return Metrics.LONG_RETVAL_NOT_SUPPORTED;
-    }
-
-    @Override
-    public long getTcpMemoryMaxUsage() {
-        return Metrics.LONG_RETVAL_NOT_SUPPORTED;
-    }
-
-    @Override
     public long getTcpMemoryUsage() {
         return CgroupSubsystemController.getLongEntry(unified, "memory.stat", "sock");
     }
 
     @Override
-    public long getMemoryAndSwapFailCount() {
-        return Metrics.LONG_RETVAL_NOT_SUPPORTED;
-    }
-
-    @Override
     public long getMemoryAndSwapLimit() {
         String strVal = CgroupSubsystemController.getStringValue(unified, "memory.swap.max");
         return limitFromString(strVal);
     }
 
     @Override
-    public long getMemoryAndSwapMaxUsage() {
-        return Metrics.LONG_RETVAL_NOT_SUPPORTED;
-    }
-
-    @Override
     public long getMemoryAndSwapUsage() {
         return getLongVal("memory.swap.current");
     }
 
     @Override
-    public Boolean isMemoryOOMKillEnabled() {
-        return Metrics.BOOL_RETVAL_NOT_SUPPORTED;
-    }
-
-    @Override
     public long getMemorySoftLimit() {
         String softLimitStr = CgroupSubsystemController.getStringValue(unified, "memory.high");
         return limitFromString(softLimitStr);
@@ -312,7 +246,7 @@
                                 .map(mapFunc)
                                 .collect(Collectors.summingLong(e -> e));
         } catch (IOException e) {
-            return Metrics.LONG_RETVAL_NOT_SUPPORTED;
+            return CgroupSubsystem.LONG_RETVAL_NOT_SUPPORTED;
         }
     }