mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
kernel: bump 5.10 to 5.10.82 (#8303)
* kernel: bump 5.10 to 5.10.81 Manually rebased: octeontx/patches-5.10/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch All other patches automatically rebased. Signed-off-by: John Audia <graysky@archlinux.us> Build system: x86_64 Build-tested: bcm2711/RPi4B, ipq806x/R7800 Run-tested: bcm2711/RPi4B, ipq806x/R7800 * kernel: bump 5.10 to 5.10.82 Removed upstreamed: bcm53xx/patches-5.10/033-v5.16-0014-ARM-dts-NSP-Fix-mpcore-mmc-node-names.patch Manually rebased: ipq806x/patches-5.10/086-ipq8064-fix-duplicate-node.patch All other patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B Run-tested: bcm2711/RPi4B Signed-off-by: John Audia <graysky@archlinux.us> Co-authored-by: John Audia <graysky@archlinux.us>
This commit is contained in:
parent
226be6c0b7
commit
31fc43272d
@ -7,10 +7,10 @@ ifdef CONFIG_TESTING_KERNEL
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
LINUX_VERSION-5.4 = .161
|
LINUX_VERSION-5.4 = .161
|
||||||
LINUX_VERSION-5.10 = .80
|
LINUX_VERSION-5.10 = .82
|
||||||
|
|
||||||
LINUX_KERNEL_HASH-5.4.161 = 3149c6b52a3079218a60bd369a80d18275b574d84908ffee32a0a8f9ddf939a7
|
LINUX_KERNEL_HASH-5.4.161 = 3149c6b52a3079218a60bd369a80d18275b574d84908ffee32a0a8f9ddf939a7
|
||||||
LINUX_KERNEL_HASH-5.10.80 = 477ce8f7624263e4346c0fc25ffc334af06bcac4d6bebdd5a7fe4681557fdb39
|
LINUX_KERNEL_HASH-5.10.82 = d66f7c7eed02f84ae550b3c91a26c70eea13682a6d672432f07bce66ff8ce350
|
||||||
|
|
||||||
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
|
||||||
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
|
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
|
||||||
|
@ -107,7 +107,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|||||||
}
|
}
|
||||||
|
|
||||||
static struct clk clk_pcie = {
|
static struct clk clk_pcie = {
|
||||||
@@ -536,6 +550,21 @@ static struct clk_lookup bcm6368_clks[]
|
@@ -542,6 +556,21 @@ static struct clk_lookup bcm6368_clks[]
|
||||||
CLKDEV_INIT(NULL, "ipsec", &clk_ipsec),
|
CLKDEV_INIT(NULL, "ipsec", &clk_ipsec),
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -129,7 +129,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
|||||||
#define HSSPI_PLL_HZ_6328 133333333
|
#define HSSPI_PLL_HZ_6328 133333333
|
||||||
#define HSSPI_PLL_HZ_6362 400000000
|
#define HSSPI_PLL_HZ_6362 400000000
|
||||||
|
|
||||||
@@ -568,6 +597,10 @@ static int __init bcm63xx_clk_init(void)
|
@@ -574,6 +603,10 @@ static int __init bcm63xx_clk_init(void)
|
||||||
case BCM6368_CPU_ID:
|
case BCM6368_CPU_ID:
|
||||||
clkdev_add_table(bcm6368_clks, ARRAY_SIZE(bcm6368_clks));
|
clkdev_add_table(bcm6368_clks, ARRAY_SIZE(bcm6368_clks));
|
||||||
break;
|
break;
|
||||||
|
@ -57,7 +57,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318
|
|||||||
mask = CKCTL_6328_HSSPI_EN;
|
mask = CKCTL_6328_HSSPI_EN;
|
||||||
else if (BCMCPU_IS_6362())
|
else if (BCMCPU_IS_6362())
|
||||||
mask = CKCTL_6362_HSSPI_EN;
|
mask = CKCTL_6362_HSSPI_EN;
|
||||||
@@ -444,6 +446,19 @@ static struct clk_lookup bcm3368_clks[]
|
@@ -450,6 +452,19 @@ static struct clk_lookup bcm3368_clks[]
|
||||||
CLKDEV_INIT("bcm63xx_enet.1", "enet", &clk_enet1),
|
CLKDEV_INIT("bcm63xx_enet.1", "enet", &clk_enet1),
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -77,7 +77,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318
|
|||||||
static struct clk_lookup bcm6328_clks[] = {
|
static struct clk_lookup bcm6328_clks[] = {
|
||||||
/* fixed rate clocks */
|
/* fixed rate clocks */
|
||||||
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
||||||
@@ -565,6 +580,7 @@ static struct clk_lookup bcm63268_clks[]
|
@@ -571,6 +586,7 @@ static struct clk_lookup bcm63268_clks[]
|
||||||
CLKDEV_INIT(NULL, "pcie", &clk_pcie),
|
CLKDEV_INIT(NULL, "pcie", &clk_pcie),
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -85,7 +85,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318
|
|||||||
#define HSSPI_PLL_HZ_6328 133333333
|
#define HSSPI_PLL_HZ_6328 133333333
|
||||||
#define HSSPI_PLL_HZ_6362 400000000
|
#define HSSPI_PLL_HZ_6362 400000000
|
||||||
|
|
||||||
@@ -574,6 +590,10 @@ static int __init bcm63xx_clk_init(void)
|
@@ -580,6 +596,10 @@ static int __init bcm63xx_clk_init(void)
|
||||||
case BCM3368_CPU_ID:
|
case BCM3368_CPU_ID:
|
||||||
clkdev_add_table(bcm3368_clks, ARRAY_SIZE(bcm3368_clks));
|
clkdev_add_table(bcm3368_clks, ARRAY_SIZE(bcm3368_clks));
|
||||||
break;
|
break;
|
||||||
|
@ -9,7 +9,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
|
|||||||
|
|
||||||
--- a/arch/mips/bcm63xx/clk.c
|
--- a/arch/mips/bcm63xx/clk.c
|
||||||
+++ b/arch/mips/bcm63xx/clk.c
|
+++ b/arch/mips/bcm63xx/clk.c
|
||||||
@@ -489,6 +489,8 @@ static struct clk_lookup bcm3368_clks[]
|
@@ -495,6 +495,8 @@ static struct clk_lookup bcm3368_clks[]
|
||||||
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
||||||
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
||||||
CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph),
|
CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph),
|
||||||
@ -18,7 +18,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
|
|||||||
/* gated clocks */
|
/* gated clocks */
|
||||||
CLKDEV_INIT(NULL, "enet0", &clk_enet0),
|
CLKDEV_INIT(NULL, "enet0", &clk_enet0),
|
||||||
CLKDEV_INIT(NULL, "enet1", &clk_enet1),
|
CLKDEV_INIT(NULL, "enet1", &clk_enet1),
|
||||||
@@ -505,7 +507,9 @@ static struct clk_lookup bcm6318_clks[]
|
@@ -511,7 +513,9 @@ static struct clk_lookup bcm6318_clks[]
|
||||||
/* fixed rate clocks */
|
/* fixed rate clocks */
|
||||||
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
||||||
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
||||||
@ -28,7 +28,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
|
|||||||
/* gated clocks */
|
/* gated clocks */
|
||||||
CLKDEV_INIT(NULL, "enetsw", &clk_enetsw),
|
CLKDEV_INIT(NULL, "enetsw", &clk_enetsw),
|
||||||
CLKDEV_INIT(NULL, "usbh", &clk_usbh),
|
CLKDEV_INIT(NULL, "usbh", &clk_usbh),
|
||||||
@@ -519,7 +523,10 @@ static struct clk_lookup bcm6328_clks[]
|
@@ -525,7 +529,10 @@ static struct clk_lookup bcm6328_clks[]
|
||||||
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
||||||
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
||||||
CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph),
|
CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph),
|
||||||
@ -39,7 +39,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
|
|||||||
/* gated clocks */
|
/* gated clocks */
|
||||||
CLKDEV_INIT(NULL, "enetsw", &clk_enetsw),
|
CLKDEV_INIT(NULL, "enetsw", &clk_enetsw),
|
||||||
CLKDEV_INIT(NULL, "usbh", &clk_usbh),
|
CLKDEV_INIT(NULL, "usbh", &clk_usbh),
|
||||||
@@ -532,6 +539,7 @@ static struct clk_lookup bcm6338_clks[]
|
@@ -538,6 +545,7 @@ static struct clk_lookup bcm6338_clks[]
|
||||||
/* fixed rate clocks */
|
/* fixed rate clocks */
|
||||||
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
||||||
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
||||||
@ -47,7 +47,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
|
|||||||
/* gated clocks */
|
/* gated clocks */
|
||||||
CLKDEV_INIT(NULL, "enet0", &clk_enet0),
|
CLKDEV_INIT(NULL, "enet0", &clk_enet0),
|
||||||
CLKDEV_INIT(NULL, "enet1", &clk_enet1),
|
CLKDEV_INIT(NULL, "enet1", &clk_enet1),
|
||||||
@@ -546,6 +554,7 @@ static struct clk_lookup bcm6345_clks[]
|
@@ -552,6 +560,7 @@ static struct clk_lookup bcm6345_clks[]
|
||||||
/* fixed rate clocks */
|
/* fixed rate clocks */
|
||||||
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
||||||
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
||||||
@ -55,7 +55,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
|
|||||||
/* gated clocks */
|
/* gated clocks */
|
||||||
CLKDEV_INIT(NULL, "enet0", &clk_enet0),
|
CLKDEV_INIT(NULL, "enet0", &clk_enet0),
|
||||||
CLKDEV_INIT(NULL, "enet1", &clk_enet1),
|
CLKDEV_INIT(NULL, "enet1", &clk_enet1),
|
||||||
@@ -560,6 +569,7 @@ static struct clk_lookup bcm6348_clks[]
|
@@ -566,6 +575,7 @@ static struct clk_lookup bcm6348_clks[]
|
||||||
/* fixed rate clocks */
|
/* fixed rate clocks */
|
||||||
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
||||||
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
||||||
@ -63,7 +63,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
|
|||||||
/* gated clocks */
|
/* gated clocks */
|
||||||
CLKDEV_INIT(NULL, "enet0", &clk_enet0),
|
CLKDEV_INIT(NULL, "enet0", &clk_enet0),
|
||||||
CLKDEV_INIT(NULL, "enet1", &clk_enet1),
|
CLKDEV_INIT(NULL, "enet1", &clk_enet1),
|
||||||
@@ -576,6 +586,8 @@ static struct clk_lookup bcm6358_clks[]
|
@@ -582,6 +592,8 @@ static struct clk_lookup bcm6358_clks[]
|
||||||
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
||||||
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
||||||
CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph),
|
CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph),
|
||||||
@ -72,7 +72,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
|
|||||||
/* gated clocks */
|
/* gated clocks */
|
||||||
CLKDEV_INIT(NULL, "enet0", &clk_enet0),
|
CLKDEV_INIT(NULL, "enet0", &clk_enet0),
|
||||||
CLKDEV_INIT(NULL, "enet1", &clk_enet1),
|
CLKDEV_INIT(NULL, "enet1", &clk_enet1),
|
||||||
@@ -595,7 +607,10 @@ static struct clk_lookup bcm6362_clks[]
|
@@ -601,7 +613,10 @@ static struct clk_lookup bcm6362_clks[]
|
||||||
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
||||||
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
||||||
CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph),
|
CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph),
|
||||||
@ -83,7 +83,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
|
|||||||
/* gated clocks */
|
/* gated clocks */
|
||||||
CLKDEV_INIT(NULL, "enetsw", &clk_enetsw),
|
CLKDEV_INIT(NULL, "enetsw", &clk_enetsw),
|
||||||
CLKDEV_INIT(NULL, "usbh", &clk_usbh),
|
CLKDEV_INIT(NULL, "usbh", &clk_usbh),
|
||||||
@@ -611,6 +626,8 @@ static struct clk_lookup bcm6368_clks[]
|
@@ -617,6 +632,8 @@ static struct clk_lookup bcm6368_clks[]
|
||||||
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
||||||
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
||||||
CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph),
|
CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph),
|
||||||
@ -92,7 +92,7 @@ Subject: [PATCH] MIPS: BCM63XX: add clkdev lookups for device tree
|
|||||||
/* gated clocks */
|
/* gated clocks */
|
||||||
CLKDEV_INIT(NULL, "enetsw", &clk_enetsw),
|
CLKDEV_INIT(NULL, "enetsw", &clk_enetsw),
|
||||||
CLKDEV_INIT(NULL, "usbh", &clk_usbh),
|
CLKDEV_INIT(NULL, "usbh", &clk_usbh),
|
||||||
@@ -625,7 +642,10 @@ static struct clk_lookup bcm63268_clks[]
|
@@ -631,7 +648,10 @@ static struct clk_lookup bcm63268_clks[]
|
||||||
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
CLKDEV_INIT(NULL, "periph", &clk_periph),
|
||||||
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
CLKDEV_INIT("bcm63xx_uart.0", "refclk", &clk_periph),
|
||||||
CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph),
|
CLKDEV_INIT("bcm63xx_uart.1", "refclk", &clk_periph),
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
* Internal peripheral clock
|
* Internal peripheral clock
|
||||||
*/
|
*/
|
||||||
static struct clk clk_periph = {
|
static struct clk clk_periph = {
|
||||||
@@ -612,6 +629,7 @@ static struct clk_lookup bcm6362_clks[]
|
@@ -618,6 +635,7 @@ static struct clk_lookup bcm6362_clks[]
|
||||||
CLKDEV_INIT("bcm63xx-hsspi.0", "pll", &clk_hsspi_pll),
|
CLKDEV_INIT("bcm63xx-hsspi.0", "pll", &clk_hsspi_pll),
|
||||||
CLKDEV_INIT("10001000.spi", "pll", &clk_hsspi_pll),
|
CLKDEV_INIT("10001000.spi", "pll", &clk_hsspi_pll),
|
||||||
/* gated clocks */
|
/* gated clocks */
|
||||||
@ -32,7 +32,7 @@
|
|||||||
CLKDEV_INIT(NULL, "enetsw", &clk_enetsw),
|
CLKDEV_INIT(NULL, "enetsw", &clk_enetsw),
|
||||||
CLKDEV_INIT(NULL, "usbh", &clk_usbh),
|
CLKDEV_INIT(NULL, "usbh", &clk_usbh),
|
||||||
CLKDEV_INIT(NULL, "usbd", &clk_usbd),
|
CLKDEV_INIT(NULL, "usbd", &clk_usbd),
|
||||||
@@ -629,6 +647,7 @@ static struct clk_lookup bcm6368_clks[]
|
@@ -635,6 +653,7 @@ static struct clk_lookup bcm6368_clks[]
|
||||||
CLKDEV_INIT("10000100.serial", "refclk", &clk_periph),
|
CLKDEV_INIT("10000100.serial", "refclk", &clk_periph),
|
||||||
CLKDEV_INIT("10000120.serial", "refclk", &clk_periph),
|
CLKDEV_INIT("10000120.serial", "refclk", &clk_periph),
|
||||||
/* gated clocks */
|
/* gated clocks */
|
||||||
@ -40,7 +40,7 @@
|
|||||||
CLKDEV_INIT(NULL, "enetsw", &clk_enetsw),
|
CLKDEV_INIT(NULL, "enetsw", &clk_enetsw),
|
||||||
CLKDEV_INIT(NULL, "usbh", &clk_usbh),
|
CLKDEV_INIT(NULL, "usbh", &clk_usbh),
|
||||||
CLKDEV_INIT(NULL, "usbd", &clk_usbd),
|
CLKDEV_INIT(NULL, "usbd", &clk_usbd),
|
||||||
@@ -647,6 +666,7 @@ static struct clk_lookup bcm63268_clks[]
|
@@ -653,6 +672,7 @@ static struct clk_lookup bcm63268_clks[]
|
||||||
CLKDEV_INIT("bcm63xx-hsspi.0", "pll", &clk_hsspi_pll),
|
CLKDEV_INIT("bcm63xx-hsspi.0", "pll", &clk_hsspi_pll),
|
||||||
CLKDEV_INIT("10001000.spi", "pll", &clk_hsspi_pll),
|
CLKDEV_INIT("10001000.spi", "pll", &clk_hsspi_pll),
|
||||||
/* gated clocks */
|
/* gated clocks */
|
||||||
|
@ -25,7 +25,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
|||||||
|
|
||||||
--- a/arch/mips/Kconfig
|
--- a/arch/mips/Kconfig
|
||||||
+++ b/arch/mips/Kconfig
|
+++ b/arch/mips/Kconfig
|
||||||
@@ -2081,7 +2081,7 @@ config CPU_MIPS32
|
@@ -2084,7 +2084,7 @@ config CPU_MIPS32
|
||||||
config CPU_MIPS64
|
config CPU_MIPS64
|
||||||
bool
|
bool
|
||||||
default y if CPU_MIPS64_R1 || CPU_MIPS64_R2 || CPU_MIPS64_R5 || \
|
default y if CPU_MIPS64_R1 || CPU_MIPS64_R2 || CPU_MIPS64_R5 || \
|
||||||
|
@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|||||||
|
|
||||||
--- a/arch/mips/Kconfig
|
--- a/arch/mips/Kconfig
|
||||||
+++ b/arch/mips/Kconfig
|
+++ b/arch/mips/Kconfig
|
||||||
@@ -1165,6 +1165,10 @@ config MIPS_MSC
|
@@ -1170,6 +1170,10 @@ config MIPS_MSC
|
||||||
config SYNC_R4K
|
config SYNC_R4K
|
||||||
bool
|
bool
|
||||||
|
|
||||||
|
@ -330,7 +330,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
|
|
||||||
--- a/net/core/sock.c
|
--- a/net/core/sock.c
|
||||||
+++ b/net/core/sock.c
|
+++ b/net/core/sock.c
|
||||||
@@ -3702,6 +3702,8 @@ static __net_initdata struct pernet_oper
|
@@ -3699,6 +3699,8 @@ static __net_initdata struct pernet_oper
|
||||||
|
|
||||||
static int __init proto_init(void)
|
static int __init proto_init(void)
|
||||||
{
|
{
|
||||||
|
@ -62,7 +62,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
+MODULE_LICENSE("GPL");
|
+MODULE_LICENSE("GPL");
|
||||||
--- a/kernel/sched/core.c
|
--- a/kernel/sched/core.c
|
||||||
+++ b/kernel/sched/core.c
|
+++ b/kernel/sched/core.c
|
||||||
@@ -3062,6 +3062,7 @@ int wake_up_state(struct task_struct *p,
|
@@ -3065,6 +3065,7 @@ int wake_up_state(struct task_struct *p,
|
||||||
{
|
{
|
||||||
return try_to_wake_up(p, state, 0);
|
return try_to_wake_up(p, state, 0);
|
||||||
}
|
}
|
||||||
|
@ -9,7 +9,7 @@ Acked-by: Rob Landley <rob@landley.net>
|
|||||||
---
|
---
|
||||||
--- a/arch/mips/Kconfig
|
--- a/arch/mips/Kconfig
|
||||||
+++ b/arch/mips/Kconfig
|
+++ b/arch/mips/Kconfig
|
||||||
@@ -1080,9 +1080,6 @@ config FW_ARC
|
@@ -1085,9 +1085,6 @@ config FW_ARC
|
||||||
config ARCH_MAY_HAVE_PC_FDC
|
config ARCH_MAY_HAVE_PC_FDC
|
||||||
bool
|
bool
|
||||||
|
|
||||||
@ -19,7 +19,7 @@ Acked-by: Rob Landley <rob@landley.net>
|
|||||||
config CEVT_BCM1480
|
config CEVT_BCM1480
|
||||||
bool
|
bool
|
||||||
|
|
||||||
@@ -3175,6 +3172,18 @@ choice
|
@@ -3178,6 +3175,18 @@ choice
|
||||||
bool "Extend builtin kernel arguments with bootloader arguments"
|
bool "Extend builtin kernel arguments with bootloader arguments"
|
||||||
endchoice
|
endchoice
|
||||||
|
|
||||||
|
@ -31,7 +31,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
|
|||||||
help
|
help
|
||||||
--- a/init/main.c
|
--- a/init/main.c
|
||||||
+++ b/init/main.c
|
+++ b/init/main.c
|
||||||
@@ -607,6 +607,29 @@ static inline void setup_nr_cpu_ids(void
|
@@ -608,6 +608,29 @@ static inline void setup_nr_cpu_ids(void
|
||||||
static inline void smp_prepare_cpus(unsigned int maxcpus) { }
|
static inline void smp_prepare_cpus(unsigned int maxcpus) { }
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -61,7 +61,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
|
|||||||
/*
|
/*
|
||||||
* We need to store the untouched command line for future reference.
|
* We need to store the untouched command line for future reference.
|
||||||
* We also need to store the touched command line since the parameter
|
* We also need to store the touched command line since the parameter
|
||||||
@@ -868,6 +891,7 @@ asmlinkage __visible void __init __no_sa
|
@@ -869,6 +892,7 @@ asmlinkage __visible void __init __no_sa
|
||||||
pr_notice("%s", linux_banner);
|
pr_notice("%s", linux_banner);
|
||||||
early_security_init();
|
early_security_init();
|
||||||
setup_arch(&command_line);
|
setup_arch(&command_line);
|
||||||
|
@ -189,7 +189,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
|
|||||||
static int kernel_init(void *);
|
static int kernel_init(void *);
|
||||||
|
|
||||||
extern void init_IRQ(void);
|
extern void init_IRQ(void);
|
||||||
@@ -905,6 +909,18 @@ asmlinkage __visible void __init __no_sa
|
@@ -906,6 +910,18 @@ asmlinkage __visible void __init __no_sa
|
||||||
pr_notice("Kernel command line: %s\n", saved_command_line);
|
pr_notice("Kernel command line: %s\n", saved_command_line);
|
||||||
/* parameters may set static keys */
|
/* parameters may set static keys */
|
||||||
jump_label_init();
|
jump_label_init();
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
device_type = "memory";
|
device_type = "memory";
|
||||||
};
|
};
|
||||||
|
|
||||||
- mdio0: mdio@0 {
|
- mdio0: mdio-0 {
|
||||||
- status = "okay";
|
- status = "okay";
|
||||||
- compatible = "virtual,mdio-gpio";
|
- compatible = "virtual,mdio-gpio";
|
||||||
- gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH>,
|
- gpios = <&qcom_pinmux 1 GPIO_ACTIVE_HIGH>,
|
||||||
@ -71,7 +71,7 @@
|
|||||||
- };
|
- };
|
||||||
- };
|
- };
|
||||||
-
|
-
|
||||||
mdio1: mdio@1 {
|
mdio1: mdio-1 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
compatible = "virtual,mdio-gpio";
|
compatible = "virtual,mdio-gpio";
|
||||||
@@ -216,6 +149,68 @@
|
@@ -216,6 +149,68 @@
|
||||||
|
@ -5481,7 +5481,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
|||||||
(transaction layer end-to-end CRC checking).
|
(transaction layer end-to-end CRC checking).
|
||||||
--- a/include/linux/pci.h
|
--- a/include/linux/pci.h
|
||||||
+++ b/include/linux/pci.h
|
+++ b/include/linux/pci.h
|
||||||
@@ -1417,6 +1417,8 @@ void pci_walk_bus(struct pci_bus *top, i
|
@@ -1419,6 +1419,8 @@ void pci_walk_bus(struct pci_bus *top, i
|
||||||
void *userdata);
|
void *userdata);
|
||||||
int pci_cfg_space_size(struct pci_dev *dev);
|
int pci_cfg_space_size(struct pci_dev *dev);
|
||||||
unsigned char pci_bus_max_busnr(struct pci_bus *bus);
|
unsigned char pci_bus_max_busnr(struct pci_bus *bus);
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/arch/mips/Kconfig
|
--- a/arch/mips/Kconfig
|
||||||
+++ b/arch/mips/Kconfig
|
+++ b/arch/mips/Kconfig
|
||||||
@@ -2431,6 +2431,12 @@ config MIPS_VPE_LOADER
|
@@ -2434,6 +2434,12 @@ config MIPS_VPE_LOADER
|
||||||
Includes a loader for loading an elf relocatable object
|
Includes a loader for loading an elf relocatable object
|
||||||
onto another VPE and running it.
|
onto another VPE and running it.
|
||||||
|
|
||||||
|
@ -187,7 +187,7 @@ Signed-off-by: Michael Gray <michael.gray@lantisproject.com>
|
|||||||
static int kernel_init(void *);
|
static int kernel_init(void *);
|
||||||
|
|
||||||
extern void init_IRQ(void);
|
extern void init_IRQ(void);
|
||||||
@@ -903,6 +907,18 @@ asmlinkage __visible void __init __no_sa
|
@@ -904,6 +908,18 @@ asmlinkage __visible void __init __no_sa
|
||||||
page_alloc_init();
|
page_alloc_init();
|
||||||
|
|
||||||
pr_notice("Kernel command line: %s\n", saved_command_line);
|
pr_notice("Kernel command line: %s\n", saved_command_line);
|
||||||
|
@ -168,7 +168,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com>
|
|||||||
static int kernel_init(void *);
|
static int kernel_init(void *);
|
||||||
|
|
||||||
extern void init_IRQ(void);
|
extern void init_IRQ(void);
|
||||||
@@ -903,6 +907,18 @@ asmlinkage __visible void __init __no_sa
|
@@ -904,6 +908,18 @@ asmlinkage __visible void __init __no_sa
|
||||||
page_alloc_init();
|
page_alloc_init();
|
||||||
|
|
||||||
pr_notice("Kernel command line: %s\n", saved_command_line);
|
pr_notice("Kernel command line: %s\n", saved_command_line);
|
||||||
|
Loading…
Reference in New Issue
Block a user