From 2348274c384e9fb240eea63f4ed4ab8d294d14bb Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@google.com>
Date: Thu, 22 May 2025 13:37:20 +0000
Subject: [PATCH] ANDROID: GKI: fix up new enum ABI break for PERR_REMOTE

In commit a4e99cd41590 ("cgroup/cpuset: Don't allow creation of local
partition over a remote one") a new enum prs_errcode was added,
PERR_REMOTE.  This triggers the ABI check logic to show it as a "break",
but as this new enum is only used within the kernel, it is safe to be
ignored.

Fixes: a4e99cd41590 ("cgroup/cpuset: Don't allow creation of local partition over a remote one")
Change-Id: Ic775557acbd1d60b8ffdc7360a2e3dee16c97fcf
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
---
 gki/aarch64/abi.stg                | 4 ++++
 gki/aarch64/abi.stg.allowed_breaks | 5 +++++
 kernel/cgroup/cpuset-internal.h    | 1 +
 3 files changed, 10 insertions(+)
 create mode 100644 gki/aarch64/abi.stg.allowed_breaks

diff --git a/gki/aarch64/abi.stg b/gki/aarch64/abi.stg
index e0506e96e113..596b6d47f5ac 100644
--- a/gki/aarch64/abi.stg
+++ b/gki/aarch64/abi.stg
@@ -311996,6 +311996,10 @@ enumeration {
       name: "PERR_ACCESS"
       value: 9
     }
+    enumerator {
+      name: "PERR_REMOTE"
+      value: 10
+    }
   }
 }
 enumeration {
diff --git a/gki/aarch64/abi.stg.allowed_breaks b/gki/aarch64/abi.stg.allowed_breaks
new file mode 100644
index 000000000000..3f769bcc1186
--- /dev/null
+++ b/gki/aarch64/abi.stg.allowed_breaks
@@ -0,0 +1,5 @@
+# How to use this file: http://go/approve-abi-break
+# ABI freeze commit: 0690b3438b4acb24f7ecfd946cf9a9ac5954ef20
+
+type 'enum prs_errcode' changed
+  enumerator 'PERR_REMOTE' (10) was added
diff --git a/kernel/cgroup/cpuset-internal.h b/kernel/cgroup/cpuset-internal.h
index 6a71f936833a..ee5f7cc2bc4b 100644
--- a/kernel/cgroup/cpuset-internal.h
+++ b/kernel/cgroup/cpuset-internal.h
@@ -36,6 +36,7 @@ enum prs_errcode {
 	PERR_ACCESS,
 	PERR_REMOTE,
 };
+ANDROID_KABI_ENUMERATOR_IGNORE(prs_errcode, PERR_REMOTE);
 
 /* bits in struct cpuset flags field */
 typedef enum {