kernel: bump 5.4 to 5.4.126
Manually rebased: bcm27xx/patches-5.4/950-0089-cgroup-Disable-cgroup-memory-by-default.patch All other patches automatically rebased. Signed-off-by: John Audia <graysky@archlinux.us>
This commit is contained in:
parent
697e80d12b
commit
d8dc9f108a
13 changed files with 41 additions and 25 deletions
|
@ -6,10 +6,10 @@ ifdef CONFIG_TESTING_KERNEL
|
||||||
KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
|
KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
LINUX_VERSION-5.4 = .125
|
LINUX_VERSION-5.4 = .126
|
||||||
LINUX_VERSION-5.10 = .46
|
LINUX_VERSION-5.10 = .46
|
||||||
|
|
||||||
LINUX_KERNEL_HASH-5.4.125 = 17ee750a4aeb1c883d721e730d1f7e2855124585e2f47766864a1359a7ebe33c
|
LINUX_KERNEL_HASH-5.4.126 = c7fd7998ab36b574326bbd67bcc2b74e4c58e81581a5f8a7a71af5185f635277
|
||||||
LINUX_KERNEL_HASH-5.10.46 = 569122a39c6b325befb9ac1c07da0c53e6363b3baacd82081d131b06c1dc1415
|
LINUX_KERNEL_HASH-5.10.46 = 569122a39c6b325befb9ac1c07da0c53e6363b3baacd82081d131b06c1dc1415
|
||||||
|
|
||||||
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
From 0f95a2f2688ff44dc7080beaa2076741a0bdf510 Mon Sep 17 00:00:00 2001
|
From 2b13c54592135b6fab269517ed687fa9f80bf8e5 Mon Sep 17 00:00:00 2001
|
||||||
From: Phil Elwell <phil@raspberrypi.org>
|
From: Phil Elwell <phil@raspberrypi.org>
|
||||||
Date: Mon, 27 Nov 2017 17:14:54 +0000
|
Date: Mon, 27 Nov 2017 17:14:54 +0000
|
||||||
Subject: [PATCH] cgroup: Disable cgroup "memory" by default
|
Subject: [PATCH] cgroup: Disable cgroup "memory" by default
|
||||||
|
@ -12,34 +12,46 @@ See: https://github.com/raspberrypi/linux/issues/1950
|
||||||
|
|
||||||
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
||||||
---
|
---
|
||||||
kernel/cgroup/cgroup.c | 30 ++++++++++++++++++++++++++++++
|
kernel/cgroup/cgroup.c | 38 ++++++++++++++++++++++++++++++++++++++
|
||||||
1 file changed, 30 insertions(+)
|
1 file changed, 38 insertions(+)
|
||||||
|
|
||||||
--- a/kernel/cgroup/cgroup.c
|
--- a/kernel/cgroup/cgroup.c
|
||||||
+++ b/kernel/cgroup/cgroup.c
|
+++ b/kernel/cgroup/cgroup.c
|
||||||
@@ -5722,6 +5722,8 @@ int __init cgroup_init_early(void)
|
@@ -5721,6 +5721,9 @@ int __init cgroup_init_early(void)
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static u16 cgroup_disable_mask __initdata;
|
|
||||||
+static u16 cgroup_enable_mask __initdata;
|
+static u16 cgroup_enable_mask __initdata;
|
||||||
+static int __init cgroup_disable(char *str);
|
+static int __init cgroup_disable(char *str);
|
||||||
|
+
|
||||||
/**
|
/**
|
||||||
* cgroup_init - cgroup initialization
|
* cgroup_init - cgroup initialization
|
||||||
@@ -5761,6 +5763,12 @@ int __init cgroup_init(void)
|
*
|
||||||
|
@@ -5759,6 +5762,12 @@ int __init cgroup_init(void)
|
||||||
|
|
||||||
mutex_unlock(&cgroup_mutex);
|
mutex_unlock(&cgroup_mutex);
|
||||||
|
|
||||||
+ /* Apply an implicit disable... */
|
+ /*
|
||||||
|
+ * Apply an implicit disable, knowing that an explicit enable will
|
||||||
|
+ * prevent if from doing anything.
|
||||||
|
+ */
|
||||||
+ cgroup_disable("memory");
|
+ cgroup_disable("memory");
|
||||||
+
|
|
||||||
+ /* ...knowing that an explicit enable will override it. */
|
|
||||||
+ cgroup_disable_mask &= ~cgroup_enable_mask;
|
|
||||||
+
|
+
|
||||||
for_each_subsys(ss, ssid) {
|
for_each_subsys(ss, ssid) {
|
||||||
if (ss->early_init) {
|
if (ss->early_init) {
|
||||||
struct cgroup_subsys_state *css =
|
struct cgroup_subsys_state *css =
|
||||||
@@ -6180,6 +6188,28 @@ static int __init cgroup_disable(char *s
|
@@ -6168,6 +6177,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);
|
||||||
|
@@ -6177,6 +6190,31 @@ static int __init cgroup_disable(char *s
|
||||||
}
|
}
|
||||||
__setup("cgroup_disable=", cgroup_disable);
|
__setup("cgroup_disable=", cgroup_disable);
|
||||||
|
|
||||||
|
@ -59,6 +71,9 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
||||||
+ continue;
|
+ continue;
|
||||||
+
|
+
|
||||||
+ cgroup_enable_mask |= 1 << i;
|
+ 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;
|
+ return 1;
|
||||||
|
|
|
@ -13,7 +13,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
||||||
|
|
||||||
--- a/drivers/spi/spi-bcm2835.c
|
--- a/drivers/spi/spi-bcm2835.c
|
||||||
+++ b/drivers/spi/spi-bcm2835.c
|
+++ b/drivers/spi/spi-bcm2835.c
|
||||||
@@ -1230,31 +1230,6 @@ static int bcm2835_spi_setup(struct spi_
|
@@ -1236,31 +1236,6 @@ static int bcm2835_spi_setup(struct spi_
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,7 @@ Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
|
||||||
/* Read as many bytes as possible from FIFO */
|
/* Read as many bytes as possible from FIFO */
|
||||||
bcm2835_rd_fifo(bs);
|
bcm2835_rd_fifo(bs);
|
||||||
/* Write as many bytes as possible to FIFO */
|
/* Write as many bytes as possible to FIFO */
|
||||||
@@ -1281,7 +1285,8 @@ static int bcm2835_spi_probe(struct plat
|
@@ -1287,7 +1291,8 @@ static int bcm2835_spi_probe(struct plat
|
||||||
bcm2835_wr(bs, BCM2835_SPI_CS,
|
bcm2835_wr(bs, BCM2835_SPI_CS,
|
||||||
BCM2835_SPI_CS_CLEAR_RX | BCM2835_SPI_CS_CLEAR_TX);
|
BCM2835_SPI_CS_CLEAR_RX | BCM2835_SPI_CS_CLEAR_TX);
|
||||||
|
|
||||||
|
|
|
@ -19,4 +19,4 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
||||||
- struct gpio_chip *chip;
|
- struct gpio_chip *chip;
|
||||||
u32 cs;
|
u32 cs;
|
||||||
|
|
||||||
/*
|
if (spi->chip_select >= BCM2835_SPI_NUM_CS) {
|
||||||
|
|
|
@ -23,7 +23,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
||||||
|
|
||||||
--- a/drivers/spi/spi.c
|
--- a/drivers/spi/spi.c
|
||||||
+++ b/drivers/spi/spi.c
|
+++ b/drivers/spi/spi.c
|
||||||
@@ -3110,6 +3110,7 @@ static int __spi_validate_bits_per_word(
|
@@ -3116,6 +3116,7 @@ static int __spi_validate_bits_per_word(
|
||||||
*/
|
*/
|
||||||
int spi_setup(struct spi_device *spi)
|
int spi_setup(struct spi_device *spi)
|
||||||
{
|
{
|
||||||
|
@ -31,7 +31,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
||||||
unsigned bad_bits, ugly_bits;
|
unsigned bad_bits, ugly_bits;
|
||||||
int status;
|
int status;
|
||||||
|
|
||||||
@@ -3127,6 +3128,14 @@ int spi_setup(struct spi_device *spi)
|
@@ -3133,6 +3134,14 @@ int spi_setup(struct spi_device *spi)
|
||||||
(SPI_TX_DUAL | SPI_TX_QUAD | SPI_TX_OCTAL |
|
(SPI_TX_DUAL | SPI_TX_QUAD | SPI_TX_OCTAL |
|
||||||
SPI_RX_DUAL | SPI_RX_QUAD | SPI_RX_OCTAL)))
|
SPI_RX_DUAL | SPI_RX_QUAD | SPI_RX_OCTAL)))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
|
@ -37,7 +37,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
||||||
|
|
||||||
--- a/drivers/spi/spi.c
|
--- a/drivers/spi/spi.c
|
||||||
+++ b/drivers/spi/spi.c
|
+++ b/drivers/spi/spi.c
|
||||||
@@ -1793,15 +1793,6 @@ static int of_spi_parse_dt(struct spi_co
|
@@ -1799,15 +1799,6 @@ static int of_spi_parse_dt(struct spi_co
|
||||||
}
|
}
|
||||||
spi->chip_select = value;
|
spi->chip_select = value;
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
||||||
|
|
||||||
--- a/drivers/spi/spi.c
|
--- a/drivers/spi/spi.c
|
||||||
+++ b/drivers/spi/spi.c
|
+++ b/drivers/spi/spi.c
|
||||||
@@ -3122,8 +3122,8 @@ int spi_setup(struct spi_device *spi)
|
@@ -3128,8 +3128,8 @@ int spi_setup(struct spi_device *spi)
|
||||||
|
|
||||||
if (ctlr->use_gpio_descriptors && ctlr->cs_gpiods &&
|
if (ctlr->use_gpio_descriptors && ctlr->cs_gpiods &&
|
||||||
ctlr->cs_gpiods[spi->chip_select] && !(spi->mode & SPI_CS_HIGH)) {
|
ctlr->cs_gpiods[spi->chip_select] && !(spi->mode & SPI_CS_HIGH)) {
|
||||||
|
|
|
@ -20,4 +20,4 @@ See: https://github.com/raspberrypi/linux/pull/3687
|
||||||
+ enum gpio_lookup_flags lflags;
|
+ enum gpio_lookup_flags lflags;
|
||||||
u32 cs;
|
u32 cs;
|
||||||
|
|
||||||
/*
|
if (spi->chip_select >= BCM2835_SPI_NUM_CS) {
|
||||||
|
|
|
@ -13,7 +13,7 @@ See: https://github.com/raspberrypi/linux/pull/3687
|
||||||
|
|
||||||
--- a/drivers/spi/spi-bcm2835.c
|
--- a/drivers/spi/spi-bcm2835.c
|
||||||
+++ b/drivers/spi/spi-bcm2835.c
|
+++ b/drivers/spi/spi-bcm2835.c
|
||||||
@@ -1235,6 +1235,43 @@ static int bcm2835_spi_setup(struct spi_
|
@@ -1241,6 +1241,43 @@ static int bcm2835_spi_setup(struct spi_
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3833,6 +3833,7 @@ CONFIG_NMI_LOG_BUF_SHIFT=13
|
||||||
# CONFIG_NVMEM_SYSFS is not set
|
# CONFIG_NVMEM_SYSFS is not set
|
||||||
# CONFIG_NVME_FC is not set
|
# CONFIG_NVME_FC is not set
|
||||||
# CONFIG_NVME_TARGET is not set
|
# CONFIG_NVME_TARGET is not set
|
||||||
|
# CONFIG_NVME_TCP is not set
|
||||||
# CONFIG_NVRAM is not set
|
# CONFIG_NVRAM is not set
|
||||||
# CONFIG_NV_TCO is not set
|
# CONFIG_NV_TCO is not set
|
||||||
# CONFIG_NXP_STB220 is not set
|
# CONFIG_NXP_STB220 is not set
|
||||||
|
|
|
@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||||
} \
|
} \
|
||||||
\
|
\
|
||||||
/* __*init sections */ \
|
/* __*init sections */ \
|
||||||
@@ -903,6 +913,8 @@
|
@@ -904,6 +914,8 @@
|
||||||
EXIT_TEXT \
|
EXIT_TEXT \
|
||||||
EXIT_DATA \
|
EXIT_DATA \
|
||||||
EXIT_CALL \
|
EXIT_CALL \
|
||||||
|
|
|
@ -20,7 +20,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
|
||||||
|
|
||||||
--- a/drivers/spi/spi.c
|
--- a/drivers/spi/spi.c
|
||||||
+++ b/drivers/spi/spi.c
|
+++ b/drivers/spi/spi.c
|
||||||
@@ -1803,13 +1803,8 @@ static int of_spi_parse_dt(struct spi_co
|
@@ -1809,13 +1809,8 @@ static int of_spi_parse_dt(struct spi_co
|
||||||
spi->mode |= SPI_CS_HIGH;
|
spi->mode |= SPI_CS_HIGH;
|
||||||
|
|
||||||
/* Device speed */
|
/* Device speed */
|
||||||
|
|
Loading…
Reference in a new issue