meta-agl-bsp: remove obsolete Raspberry Pi kernel patch

Remove patch to reenable memory cgroups support, as it is no longer
necessary with the latest kernel bump in meta-raspberrypi (upstream
has moved to a kernel command-line option for disabling instead).

Bug-AGL: SPEC-5392

Change-Id: I48d49354c7db9d7eaa71da241f96de0a05cf931f
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/30897
ci-image-build: Jenkins Job builder account
Tested-by: Jenkins Job builder account
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
ci-image-boot-test: Jenkins Job builder account
(cherry picked from commit caf618d7fec8e9ff21002da5677170366547911e)
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/30867

diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi/0001-Revert-cgroup-Disable-cgroup-memory-by-default.patch b/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi/0001-Revert-cgroup-Disable-cgroup-memory-by-default.patch
deleted file mode 100644 (file)
index 3a0be62..0000000
--- a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi/0001-Revert-cgroup-Disable-cgroup-memory-by-default.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From eec171e22de23a8bb7321da2bd405a95d4521f92 Mon Sep 17 00:00:00 2001
-From: Naoto Yamaguchi <naoto.yamaguchi@aisin.co.jp>
-Date: Tue, 4 Feb 2025 00:55:36 +0900
-Subject: [PATCH] Revert "cgroup: Disable cgroup "memory" by default"
-
-This reverts commit 94a23e978235cd35f38075072b34152b2b667e6e.
-
-Upstream-Status: Pending
-
----
- kernel/cgroup/cgroup.c | 38 --------------------------------------
- 1 file changed, 38 deletions(-)
-
-diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
-index 5165f5ccd1b4..518725b57200 100644
---- a/kernel/cgroup/cgroup.c
-+++ b/kernel/cgroup/cgroup.c
-@@ -6051,9 +6051,6 @@ int __init cgroup_init_early(void)
-       return 0;
- }
- 
--static u16 cgroup_enable_mask __initdata;
--static int __init cgroup_disable(char *str);
--
- /**
-  * cgroup_init - cgroup initialization
-  *
-@@ -6087,12 +6084,6 @@ int __init cgroup_init(void)
- 
-       cgroup_unlock();
- 
--      /*
--       * Apply an implicit disable, knowing that an explicit enable will
--       * prevent if from doing anything.
--       */
--      cgroup_disable("memory");
--
-       for_each_subsys(ss, ssid) {
-               if (ss->early_init) {
-                       struct cgroup_subsys_state *css =
-@@ -6733,10 +6724,6 @@ static int __init cgroup_disable(char *str)
-                           strcmp(token, ss->legacy_name))
-                               continue;
- 
--                      /* An explicit cgroup_enable overrides a disable */
--                      if (cgroup_enable_mask & (1 << i))
--                              continue;
--
-                       static_branch_disable(cgroup_subsys_enabled_key[i]);
-                       pr_info("Disabling %s control group subsystem\n",
-                               ss->name);
-@@ -6755,31 +6742,6 @@ static int __init cgroup_disable(char *str)
- }
- __setup("cgroup_disable=", cgroup_disable);
- 
--static int __init cgroup_enable(char *str)
--{
--      struct cgroup_subsys *ss;
--      char *token;
--      int i;
--
--      while ((token = strsep(&str, ",")) != NULL) {
--              if (!*token)
--                      continue;
--
--              for_each_subsys(ss, i) {
--                      if (strcmp(token, ss->name) &&
--                          strcmp(token, ss->legacy_name))
--                              continue;
--
--                      cgroup_enable_mask |= 1 << i;
--                      static_branch_enable(cgroup_subsys_enabled_key[i]);
--                      pr_info("Enabling %s control group subsystem\n",
--                              ss->name);
--              }
--      }
--      return 1;
--}
--__setup("cgroup_enable=", cgroup_enable);
--
- void __init __weak enable_debug_cgroup(void) { }
- 
- static int __init enable_cgroup_debug(char *str)
--- 
-2.43.0
-

diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend b/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend
index 65f760f..ec3fa91 100644 (file)
--- a/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend
+++ b/meta-agl-bsp/meta-raspberrypi/recipes-kernel/linux/linux-raspberrypi_%.bbappend
@@ -5,7 +5,6 @@ require recipes-kernel/linux/linux-yocto-agl.inc
 SRC_URI:append = " \
     ${@oe.utils.conditional('USE_FAYTECH_MONITOR', '1', 'file://0002-faytech-fix-rpi.patch', '', d)} \
     file://0001-mconf-menuconfig.patch \
-    file://0001-Revert-cgroup-Disable-cgroup-memory-by-default.patch \
 "
 
 # Enable support for Pi foundation touchscreen