diff options
Diffstat (limited to 'target/linux/brcm2708')
-rw-r--r-- | target/linux/brcm2708/patches-4.4/0027-Main-bcm2708-bcm2709-linux-port.patch | 2 | ||||
-rw-r--r-- | target/linux/brcm2708/patches-4.4/0062-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm2708/patches-4.4/0027-Main-bcm2708-bcm2709-linux-port.patch b/target/linux/brcm2708/patches-4.4/0027-Main-bcm2708-bcm2709-linux-port.patch index 7a4c34dae9..8a5ffbbbde 100644 --- a/target/linux/brcm2708/patches-4.4/0027-Main-bcm2708-bcm2709-linux-port.patch +++ b/target/linux/brcm2708/patches-4.4/0027-Main-bcm2708-bcm2709-linux-port.patch @@ -140,7 +140,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org> source "arch/arm/mach-alpine/Kconfig" --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug -@@ -1241,6 +1241,14 @@ choice +@@ -1240,6 +1240,14 @@ choice options; the platform specific options are deprecated and will be soon removed. diff --git a/target/linux/brcm2708/patches-4.4/0062-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch b/target/linux/brcm2708/patches-4.4/0062-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch index 03a603c500..da08b51ddc 100644 --- a/target/linux/brcm2708/patches-4.4/0062-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch +++ b/target/linux/brcm2708/patches-4.4/0062-config-Enable-CONFIG_MEMCG-but-leave-it-disabled-due.patch @@ -10,7 +10,7 @@ Subject: [PATCH 062/156] config: Enable CONFIG_MEMCG, but leave it disabled --- a/kernel/cgroup.c +++ b/kernel/cgroup.c -@@ -5273,7 +5273,7 @@ int __init cgroup_init_early(void) +@@ -5286,7 +5286,7 @@ int __init cgroup_init_early(void) return 0; } @@ -19,7 +19,7 @@ Subject: [PATCH 062/156] config: Enable CONFIG_MEMCG, but leave it disabled /** * cgroup_init - cgroup initialization -@@ -5769,6 +5769,27 @@ static int __init cgroup_disable(char *s +@@ -5782,6 +5782,27 @@ static int __init cgroup_disable(char *s } __setup("cgroup_disable=", cgroup_disable); |