From c0a451d4f25b23fa1e12386c95e39de675e4dc66 Mon Sep 17 00:00:00 2001
From: Achigo Liu <achigoliu@google.com>
Date: Wed, 17 Apr 2024 09:35:40 +0000
Subject: [PATCH] Revert "Move tasks from cpuset root group to system group"

Revert submission 26931570-cpuset_system_group

Reason for revert: b/335346990 suspend/resume ramdump or black screen

Reverted changes: /q/submissionid:26931570-cpuset_system_group

Change-Id: I41b3eaeddba8725defa742c5bd4c5377ac3a33fe
---
 conf/init.zumapro.soc.rc | 15 ---------------
 task_profiles.json       | 13 -------------
 2 files changed, 28 deletions(-)

diff --git a/conf/init.zumapro.soc.rc b/conf/init.zumapro.soc.rc
index b53139c..52205a8 100644
--- a/conf/init.zumapro.soc.rc
+++ b/conf/init.zumapro.soc.rc
@@ -1,16 +1,4 @@
 on init
-    # Move cpuset root group to system group
-    mkdir /dev/cpuset/system
-    copy /dev/cpuset/cpus /dev/cpuset/system/cpus
-    copy /dev/cpuset/mems /dev/cpuset/system/mems
-    chown system system /dev/cpuset/system
-    chown system system /dev/cpuset/system/tasks
-    chown system system /dev/cpuset/system/cgroup.procs
-    chmod 0664 /dev/cpuset/system/tasks
-    chmod 0664 /dev/cpuset/system/cgroup.procs
-
-    copy_per_line /dev/cpuset/tasks /dev/cpuset/system/tasks
-
     chown system system /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/lcpi_threshold
     chown system system /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold
     chown system system /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/limit_frequency
@@ -162,9 +150,6 @@ on property:init.svc.vendor.charger=running
     write /sys/devices/system/cpu/cpu6/online 0
 
 on property:sys.boot_completed=1
-    # Move remaining tasks
-    copy_per_line /dev/cpuset/tasks /dev/cpuset/system/tasks
-
     # Set kswapd affinity
     write /sys/kernel/vendor_mm/kswapd_cpu_affinity 7f
 
diff --git a/task_profiles.json b/task_profiles.json
index a16c507..732ccd1 100644
--- a/task_profiles.json
+++ b/task_profiles.json
@@ -1,18 +1,5 @@
 {
   "Profiles": [
-    {
-      "Name": "ProcessCapacityNormal",
-      "Actions": [
-        {
-          "Name": "JoinCgroup",
-          "Params":
-          {
-            "Controller": "cpuset",
-            "Path": "system"
-          }
-        }
-      ]
-    },
     {
       "Name": "MaxPerformance",
       "Actions": [