NVIDIA: [Config] annotations 'refactor'

Signed-off-by: Brad Figg <[email protected]>

Author: nvidia-bfigg

debian.nvidia-adv/config/annotations

@@ -171,10 +171,15 @@ CONFIG_ULTRASOC_SMB                             note<'{Required for Grace enable
 
 # ---- Annotations without notes ----
 
+CONFIG_ACPI_MPAM                                policy<{'amd64': '-', 'arm64': 'y'}>
+CONFIG_ARCH_HAS_CPU_RESCTRL                     policy<{'amd64': 'y', 'arm64': 'y'}>
+CONFIG_ARM64_MPAM                               policy<{'amd64': '-', 'arm64': 'y'}>
+CONFIG_ARM_CPU_RESCTRL                          policy<{'amd64': '-', 'arm64': 'y'}>
 CONFIG_AX88796B_RUST_PHY                        policy<{'amd64': '-'}>
 CONFIG_BCH                                      policy<{'amd64': 'm', 'arm64': 'y'}>
 CONFIG_BINDGEN_VERSION_TEXT                     policy<{'amd64': '-'}>
 CONFIG_CC_VERSION_TEXT                          policy<{'amd64': '"x86_64-linux-gnu-gcc-13 (Ubuntu 13.3.0-6ubuntu2~24.04) 13.3.0"', 'arm64': '"aarch64-linux-gnu-gcc-13 (Ubuntu 13.3.0-6ubuntu2~24.04) 13.3.0"'}>
+CONFIG_CGROUP_RESCTRL                           policy<{'amd64': 'n', 'arm64': 'n'}>
 CONFIG_CONSTRUCTORS                             policy<{'amd64': '-'}>
 CONFIG_EFI_CAPSULE_LOADER                       policy<{'amd64': 'm', 'arm64': 'y'}>
 CONFIG_FAILSLAB                                 policy<{'arm64': 'n'}>
@@ -194,6 +199,11 @@ CONFIG_IOMMU_IOPF                               policy<{'amd64': 'y', 'arm64': '
 CONFIG_MTD_NAND_CORE                            policy<{'amd64': 'm', 'arm64': 'y'}>
 CONFIG_NVGRACE_EGM                              policy<{'arm64': 'm'}>
 CONFIG_NVGRACE_GPU_VFIO_PCI                     policy<{'arm64': 'm'}>
+CONFIG_PROC_CPU_RESCTRL                         policy<{'amd64': 'y', 'arm64': 'y'}>
+CONFIG_RESCTRL_FS                               policy<{'amd64': 'y', 'arm64': 'y'}>
+CONFIG_RESCTRL_FS_PSEUDO_LOCK                   policy<{'amd64': 'y', 'arm64': '-'}>
+CONFIG_RESCTRL_PMU                              policy<{'amd64': 'n', 'arm64': 'y'}>
+CONFIG_RESCTRL_RMID_DEPENDS_ON_CLOSID           policy<{'amd64': '-', 'arm64': 'y'}>
 CONFIG_RUSTC_VERSION_TEXT                       policy<{'amd64': '-'}>
 CONFIG_RUST_BUILD_ASSERT_ALLOW                  policy<{'amd64': '-'}>
 CONFIG_RUST_DEBUG_ASSERTIONS                    policy<{'amd64': '-'}>
@@ -204,16 +214,3 @@ CONFIG_SCSI_UFS_FAULT_INJECTION                 policy<{'arm64': 'n'}>
 CONFIG_TEGRA241_CMDQV                           policy<{'arm64': 'y'}>
 CONFIG_VFIO_CONTAINER                           policy<{'amd64': 'y', 'arm64': 'n'}>
 CONFIG_VFIO_IOMMU_TYPE1                         policy<{'amd64': 'm', 'arm64': '-'}>
-
-# ---- Annotations for MPAM patches ----
-
-CONFIG_ARM64_MPAM                               policy<{'amd64': '-', 'arm64': 'y'}>
-CONFIG_ACPI_MPAM                                policy<{'amd64': '-', 'arm64': 'y'}>
-CONFIG_ARCH_HAS_CPU_RESCTRL                     policy<{'amd64': 'y', 'arm64': 'y'}>
-CONFIG_ARM_CPU_RESCTRL                          policy<{'amd64': '-', 'arm64': 'y'}>
-CONFIG_PROC_CPU_RESCTRL                         policy<{'amd64': 'y', 'arm64': 'y'}>
-CONFIG_RESCTRL_FS                               policy<{'amd64': 'y', 'arm64': 'y'}>
-CONFIG_RESCTRL_FS_PSEUDO_LOCK                   policy<{'amd64': 'y', 'arm64': '-'}>
-CONFIG_RESCTRL_PMU                              policy<{'amd64': 'n', 'arm64': 'y'}>
-CONFIG_RESCTRL_RMID_DEPENDS_ON_CLOSID           policy<{'amd64': '-', 'arm64': 'y'}>
-CONFIG_CGROUP_RESCTRL                           policy<{'amd64': 'n', 'arm64': 'n'}>