aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--afdo_tools/update_kernel_afdo.cfg2
-rwxr-xr-xafdo_tools/update_kernel_afdo.py11
2 files changed, 10 insertions, 3 deletions
diff --git a/afdo_tools/update_kernel_afdo.cfg b/afdo_tools/update_kernel_afdo.cfg
index a69d6f84..8b9e6a93 100644
--- a/afdo_tools/update_kernel_afdo.cfg
+++ b/afdo_tools/update_kernel_afdo.cfg
@@ -3,6 +3,6 @@
# WARNING: Changes must be submitted to have effect.
AMD_KVERS="5.4 5.10 5.15 6.1"
-ARM_KVERS="5.15"
+ARM_KVERS=""
AMD_METADATA_FILE="afdo_metadata/kernel_afdo.json"
ARM_METADATA_FILE="afdo_metadata/kernel_arm_afdo.json"
diff --git a/afdo_tools/update_kernel_afdo.py b/afdo_tools/update_kernel_afdo.py
index 0a299bd2..a5c11fba 100755
--- a/afdo_tools/update_kernel_afdo.py
+++ b/afdo_tools/update_kernel_afdo.py
@@ -76,11 +76,18 @@ class KernelVersion:
return cls(major=int(m.group(1)), minor=int(m.group(2)))
+ARM_KERNEL_5_15 = (Arch.ARM, KernelVersion(5, 15))
+
# Versions that rolling should be skipped on, for one reason or another.
SKIPPED_VERSIONS: Dict[int, Iterable[Tuple[Arch, KernelVersion]]] = {
# Kernel tracing was disabled on ARM in 114, b/275560674
- 114: ((Arch.ARM, KernelVersion(5, 15)),),
- 115: ((Arch.ARM, KernelVersion(5, 15)),),
+ 114: (ARM_KERNEL_5_15,),
+ 115: (ARM_KERNEL_5_15,),
+ # Kernel profiles are no longer generated as of M126. Don't complain about
+ # them.
+ 124: (ARM_KERNEL_5_15,),
+ 125: (ARM_KERNEL_5_15,),
+ 126: (ARM_KERNEL_5_15,),
}