mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-29 10:08:59 +00:00
c6ddf8d502
Many changes were done in drivers/pinctrl/bcm/pinctrl-bcm2835.c between 5.4.171 and 5.4.179. The following 3 patches do not apply any more: * target/linux/bcm27xx/patches-5.4/950-0316-pinctrl-bcm2835-Add-support-for-BCM2711-pull-up-func.patch This was already integrated in kernel v5.4-rc1, it was never needed. * target/linux/bcm27xx/patches-5.4/950-0328-Revert-pinctrl-bcm2835-Pass-irqchip-when-adding-gpio.patch * target/linux/bcm27xx/patches-5.4/950-0362-pinctrl-bcm2835-Change-init-order-for-gpio-hogs.patch I think these were done to fix the problem which was really fixed in commit 75278f1aff5e ("pinctrl: bcm2835: Change init order for gpio hogs") from v5.4.175 target/linux/generic/backport-5.4/716-v5.5-net-sfp-move-fwnode-parsing-into-sfp-bus-layer.patch Move fwnode_device_is_available to the same position as in kernel 5.10. target/linux/layerscape/patches-5.4/302-dts-0083-arm64-ls1028a-qds-correct-bus-of-rtc.patch Applied in commit 65816c1034769e714edb70f59a33bc5472d9e55f ("arm64: dts: ls1028a-qds: move rtc node to the correct i2c bus") Compile-tested: lantiq/xrx200, bcm27xx/bcm2710 Run-tested: lantiq/xrx200 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
86 lines
2.2 KiB
Diff
86 lines
2.2 KiB
Diff
From 2b13c54592135b6fab269517ed687fa9f80bf8e5 Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
Date: Mon, 27 Nov 2017 17:14:54 +0000
|
|
Subject: [PATCH] cgroup: Disable cgroup "memory" by default
|
|
|
|
Some Raspberry Pis have limited RAM and most users won't use the
|
|
cgroup memory support so it is disabled by default. Enable with:
|
|
|
|
cgroup_enable=memory
|
|
|
|
See: https://github.com/raspberrypi/linux/issues/1950
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|
---
|
|
kernel/cgroup/cgroup.c | 38 ++++++++++++++++++++++++++++++++++++++
|
|
1 file changed, 38 insertions(+)
|
|
|
|
--- a/kernel/cgroup/cgroup.c
|
|
+++ b/kernel/cgroup/cgroup.c
|
|
@@ -5749,6 +5749,9 @@ 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
|
|
*
|
|
@@ -5787,6 +5790,12 @@ int __init cgroup_init(void)
|
|
|
|
mutex_unlock(&cgroup_mutex);
|
|
|
|
+ /*
|
|
+ * 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 =
|
|
@@ -6196,6 +6205,10 @@ static int __init cgroup_disable(char *s
|
|
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);
|
|
@@ -6205,6 +6218,31 @@ static int __init cgroup_disable(char *s
|
|
}
|
|
__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)
|