Rebase and re-enable various patches for 3.19
svn path=/dists/trunk/linux/; revision=22362
This commit is contained in:
Ben Hutchings
parent
207ecec09f
commit
2aa87b787b
|
|
@ -10,16 +10,14 @@ Signed-off-by: Feng Kan <fkan at apm.com>
|
|||
|
||||
ijc -- obsoleted by upstream syscon-reboot driver reworking, but that is too
|
||||
big to backport.
|
||||
|
||||
[bwh: Forward-ported to 3.19]
|
||||
---
|
||||
arch/arm64/boot/dts/apm-storm.dtsi | 5 +++++
|
||||
arch/arm64/boot/dts/apm/apm-storm.dtsi | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/apm-storm.dtsi b/arch/arm64/boot/dts/apm-storm.dtsi
|
||||
index e2af321..0d796ad 100644
|
||||
--- a/arch/arm64/boot/dts/apm-storm.dtsi
|
||||
+++ b/arch/arm64/boot/dts/apm-storm.dtsi
|
||||
@@ -302,6 +302,11 @@
|
||||
--- a/arch/arm64/boot/dts/apm/apm-storm.dtsi
|
||||
+++ b/arch/arm64/boot/dts/apm/apm-storm.dtsi
|
||||
@@ -480,6 +480,11 @@
|
||||
interrupts = <0x0 0x4c 0x4>;
|
||||
};
|
||||
|
||||
|
|
@ -31,6 +29,3 @@ index e2af321..0d796ad 100644
|
|||
serial1: serial@1c021000 {
|
||||
status = "disabled";
|
||||
device_type = "serial";
|
||||
--
|
||||
2.1.3
|
||||
|
||||
|
|
|
|||
|
|
@ -13,25 +13,21 @@ Signed-off-by: Feng Kan <fkan at apm.com>
|
|||
|
||||
ijc -- obsoleted by upstream syscon-reboot driver reworking, but that is too
|
||||
big to backport.
|
||||
[bwh: Forward-ported to 3.19]
|
||||
|
||||
---
|
||||
drivers/power/reset/xgene-reboot.c | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/power/reset/xgene-reboot.c b/drivers/power/reset/xgene-reboot.c
|
||||
index ecd55f8..4a63f8f 100644
|
||||
--- a/drivers/power/reset/xgene-reboot.c
|
||||
+++ b/drivers/power/reset/xgene-reboot.c
|
||||
@@ -73,8 +73,7 @@ static int xgene_reboot_probe(struct platform_device *pdev)
|
||||
@@ -74,8 +74,7 @@ static int xgene_reboot_probe(struct pla
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
- if (of_property_read_u32(pdev->dev.of_node, "mask", &ctx->mask))
|
||||
- if (of_property_read_u32(dev->of_node, "mask", &ctx->mask))
|
||||
- ctx->mask = 0xFFFFFFFF;
|
||||
+ ctx->mask = 0x1;
|
||||
|
||||
ctx->pdev = pdev;
|
||||
arm_pm_restart = xgene_restart;
|
||||
--
|
||||
2.1.3
|
||||
|
||||
ctx->dev = dev;
|
||||
ctx->restart_handler.notifier_call = xgene_restart_handler;
|
||||
|
|
|
|||
|
|
@ -2,24 +2,26 @@ Author: Michael Schmitz <schmitzmic@gmail.com>
|
|||
Description: Make SMC91X driver selectable for ATARI_ETHERNAT boards
|
||||
Origin: https://git.kernel.org/cgit/linux/kernel/git/geert/linux-m68k.git/commit/?id=edee09224891c259071238d5a8d2be5e3ca7f09c
|
||||
|
||||
[bwh: Forward-ported to 3.19]
|
||||
--- a/drivers/net/ethernet/smsc/Kconfig
|
||||
+++ b/drivers/net/ethernet/smsc/Kconfig
|
||||
@@ -6,7 +6,8 @@ config NET_VENDOR_SMSC
|
||||
bool "SMC (SMSC)/Western Digital devices"
|
||||
default y
|
||||
depends on ARM || ISA || MAC || ARM64 || MIPS || M32R || SUPERH || \
|
||||
- BLACKFIN || MN10300 || COLDFIRE || XTENSA || PCI || PCMCIA
|
||||
+ BLACKFIN || MN10300 || COLDFIRE || XTENSA || PCI || PCMCIA || \
|
||||
+ ATARI_ETHERNAT
|
||||
- BLACKFIN || MN10300 || COLDFIRE || XTENSA || NIOS2 || PCI || PCMCIA
|
||||
+ BLACKFIN || MN10300 || COLDFIRE || XTENSA || NIOS2 || PCI || \
|
||||
+ PCMCIA || ATARI_ETHERNAT
|
||||
---help---
|
||||
If you have a network (Ethernet) card belonging to this class, say Y
|
||||
and read the Ethernet-HOWTO, available from
|
||||
@@ -39,7 +40,7 @@ config SMC91X
|
||||
@@ -39,7 +40,8 @@ config SMC91X
|
||||
select CRC32
|
||||
select MII
|
||||
depends on (ARM || M32R || SUPERH || MIPS || BLACKFIN || \
|
||||
- MN10300 || COLDFIRE || ARM64 || XTENSA)
|
||||
+ MN10300 || COLDFIRE || ARM64 || XTENSA || ATARI_ETHERNAT)
|
||||
- MN10300 || COLDFIRE || ARM64 || XTENSA || NIOS2) && (!OF || GPIOLIB)
|
||||
+ MN10300 || COLDFIRE || ARM64 || XTENSA || NIOS2 || \
|
||||
+ ATARI_ETHERNAT) && (!OF || GPIOLIB)
|
||||
---help---
|
||||
This is a driver for SMC's 91x series of Ethernet chipsets,
|
||||
including the SMC91C94 and the SMC91C111. Say Y if you want it
|
||||
|
|
|
|||
|
|
@ -32,9 +32,9 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|||
a single hierarchy
|
||||
--- a/init/Kconfig
|
||||
+++ b/init/Kconfig
|
||||
@@ -1005,6 +1005,14 @@ config MEMCG
|
||||
disable memory resource controller and you can avoid overheads.
|
||||
(and lose benefits of memory resource controller)
|
||||
@@ -983,6 +983,14 @@ config MEMCG
|
||||
Provides a memory resource controller that manages both anonymous
|
||||
memory and page cache. (See Documentation/cgroups/memory.txt)
|
||||
|
||||
+config MEMCG_DISABLED
|
||||
+ bool "Memory Resource Controller disabled by default"
|
||||
|
|
@ -49,7 +49,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|||
depends on MEMCG && SWAP
|
||||
--- a/kernel/cgroup.c
|
||||
+++ b/kernel/cgroup.c
|
||||
@@ -5299,7 +5299,7 @@ out_free:
|
||||
@@ -5366,7 +5366,7 @@ out_free:
|
||||
kfree(pathbuf);
|
||||
}
|
||||
|
||||
|
|
@ -58,7 +58,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|||
{
|
||||
struct cgroup_subsys *ss;
|
||||
char *token;
|
||||
@@ -5311,17 +5311,29 @@ static int __init cgroup_disable(char *s
|
||||
@@ -5378,17 +5378,29 @@ static int __init cgroup_disable(char *s
|
||||
|
||||
for_each_subsys(ss, i) {
|
||||
if (!strcmp(token, ss->name)) {
|
||||
|
|
@ -93,7 +93,7 @@ Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|||
printk("cgroup: using legacy files on the default hierarchy\n");
|
||||
--- a/mm/memcontrol.c
|
||||
+++ b/mm/memcontrol.c
|
||||
@@ -6196,6 +6196,9 @@ static void mem_cgroup_bind(struct cgrou
|
||||
@@ -5387,6 +5387,9 @@ static void mem_cgroup_bind(struct cgrou
|
||||
}
|
||||
|
||||
struct cgroup_subsys memory_cgrp_subsys = {
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ Add a Loongson LS3A RS780E 1-way machine definition, which only differs
|
|||
from other Loongson 3 based machines by the UART base clock speed.
|
||||
|
||||
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
|
||||
[bwh: Forward-ported to 3.19]
|
||||
---
|
||||
arch/mips/include/asm/bootinfo.h | 1 +
|
||||
arch/mips/loongson/common/machtype.c | 1 +
|
||||
|
|
@ -14,54 +15,43 @@ Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
|
|||
arch/mips/loongson/common/uart_base.c | 1 +
|
||||
4 files changed, 4 insertions(+)
|
||||
|
||||
diff --git a/arch/mips/include/asm/bootinfo.h b/arch/mips/include/asm/bootinfo.h
|
||||
index 1f7ca8b..c3efea0 100644
|
||||
--- a/arch/mips/include/asm/bootinfo.h
|
||||
+++ b/arch/mips/include/asm/bootinfo.h
|
||||
@@ -74,6 +74,7 @@ enum loongson_machine_type {
|
||||
MACH_LEMOTE_A1101,
|
||||
MACH_LEMOTE_A1201,
|
||||
MACH_LEMOTE_A1205,
|
||||
@@ -71,6 +71,7 @@ enum loongson_machine_type {
|
||||
MACH_LEMOTE_NAS,
|
||||
MACH_LEMOTE_LL2F,
|
||||
MACH_LOONGSON_GENERIC,
|
||||
+ MACH_LOONGSON_3A780E1W,
|
||||
MACH_LOONGSON_END
|
||||
};
|
||||
|
||||
diff --git a/arch/mips/loongson/common/machtype.c b/arch/mips/loongson/common/machtype.c
|
||||
index 1a47979..3b88f88 100644
|
||||
--- a/arch/mips/loongson/common/machtype.c
|
||||
+++ b/arch/mips/loongson/common/machtype.c
|
||||
@@ -31,6 +31,7 @@ static const char *system_types[] = {
|
||||
[MACH_LEMOTE_A1101] "lemote-3a-itx-a1101",
|
||||
[MACH_LEMOTE_A1201] "lemote-2gq-notebook-a1201",
|
||||
[MACH_LEMOTE_A1205] "lemote-2gq-aio-a1205",
|
||||
+ [MACH_LOONGSON_3A780E1W] "loongson-ls3a-rs780e-1w",
|
||||
[MACH_LOONGSON_END] NULL,
|
||||
@@ -28,6 +28,7 @@ static const char *system_types[] = {
|
||||
[MACH_LEMOTE_NAS] = "lemote-nas-2f",
|
||||
[MACH_LEMOTE_LL2F] = "lemote-lynloong-2f",
|
||||
[MACH_LOONGSON_GENERIC] = "generic-loongson-machine",
|
||||
+ [MACH_LOONGSON_3A780E1W] = "loongson-ls3a-rs780e-1w",
|
||||
[MACH_LOONGSON_END] = NULL,
|
||||
};
|
||||
|
||||
diff --git a/arch/mips/loongson/common/serial.c b/arch/mips/loongson/common/serial.c
|
||||
index bd2b709..f1cc859 100644
|
||||
--- a/arch/mips/loongson/common/serial.c
|
||||
+++ b/arch/mips/loongson/common/serial.c
|
||||
@@ -51,6 +51,7 @@ static struct plat_serial8250_port uart8250_data[][2] = {
|
||||
[MACH_LEMOTE_A1101] {PORT_M(2, 25000000), {} },
|
||||
[MACH_LEMOTE_A1201] {PORT_M(2, 25000000), {} },
|
||||
[MACH_LEMOTE_A1205] {PORT_M(2, 25000000), {} },
|
||||
+ [MACH_LOONGSON_3A780E1W] {PORT_M(2, 33177600), {} },
|
||||
[MACH_LOONGSON_END] {},
|
||||
@@ -48,6 +48,7 @@ static struct plat_serial8250_port uart8
|
||||
[MACH_LEMOTE_NAS] = {PORT_M(3, 3686400), {} },
|
||||
[MACH_LEMOTE_LL2F] = {PORT(3, 1843200), {} },
|
||||
[MACH_LOONGSON_GENERIC] = {PORT_M(2, 25000000), {} },
|
||||
+ [MACH_LOONGSON_3A780E1W] = {PORT_M(2, 33177600), {} },
|
||||
[MACH_LOONGSON_END] = {},
|
||||
};
|
||||
|
||||
diff --git a/arch/mips/loongson/common/uart_base.c b/arch/mips/loongson/common/uart_base.c
|
||||
index 1e1eeea..406cb24 100644
|
||||
--- a/arch/mips/loongson/common/uart_base.c
|
||||
+++ b/arch/mips/loongson/common/uart_base.c
|
||||
@@ -42,6 +42,7 @@ void prom_init_loongson_uart_base(void)
|
||||
case MACH_LEMOTE_A1101:
|
||||
case MACH_LEMOTE_A1201:
|
||||
case MACH_LEMOTE_A1205:
|
||||
@@ -25,6 +25,7 @@ void prom_init_loongson_uart_base(void)
|
||||
{
|
||||
switch (mips_machtype) {
|
||||
case MACH_LOONGSON_GENERIC:
|
||||
+ case MACH_LOONGSON_3A780E1W:
|
||||
/* The CPU provided serial port (CPU) */
|
||||
loongson_uart_base = LOONGSON_REG_BASE + 0x1e0;
|
||||
loongson_uart_base[0] = LOONGSON_REG_BASE + 0x1e0;
|
||||
break;
|
||||
--
|
||||
2.0.0
|
||||
|
||||
|
|
|
|||
|
|
@ -24,9 +24,8 @@ debian/fs-enable-link-security-restrictions-by-default.patch
|
|||
|
||||
# Set various features runtime-disabled by default
|
||||
debian/sched-autogroup-disabled.patch
|
||||
# TODO: check 9edad6ea0f1416415f6fe31cc9d1dbc3817803ed
|
||||
# features/all/cgroups-Allow-memory-cgroup-support-to-be-included-b.patch
|
||||
# debian/cgroups-Document-the-Debian-memory-resource-controll.patch
|
||||
features/all/cgroups-Allow-memory-cgroup-support-to-be-included-b.patch
|
||||
debian/cgroups-Document-the-Debian-memory-resource-controll.patch
|
||||
debian/yama-disable-by-default.patch
|
||||
debian/add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by-default.patch
|
||||
|
||||
|
|
@ -39,16 +38,13 @@ bugfix/x86/viafb-autoload-on-olpc-xo1.5-only.patch
|
|||
|
||||
# Arch bug fixes
|
||||
bugfix/mips/disable-advansys.patch
|
||||
# TODO:
|
||||
#bugfix/m68k/ethernat-kconfig.patch
|
||||
# TODO: check if obsolete
|
||||
# bugfix/arm64/arm64-add-missing-dts-entry-for-X-Gene-platform.patch
|
||||
# bugfix/arm64/arm64-removed-using-of-the-mask-attribute-in-the-dts.patch
|
||||
bugfix/m68k/ethernat-kconfig.patch
|
||||
bugfix/arm64/arm64-add-missing-dts-entry-for-X-Gene-platform.patch
|
||||
bugfix/arm64/arm64-removed-using-of-the-mask-attribute-in-the-dts.patch
|
||||
|
||||
# Arch features
|
||||
features/mips/MIPS-increase-MAX-PHYSMEM-BITS-on-Loongson-3-only.patch
|
||||
# TODO: fwd port
|
||||
# features/mips/MIPS-Loongson-3-Add-Loongson-LS3A-RS780E-1-way-machi.patch
|
||||
features/mips/MIPS-Loongson-3-Add-Loongson-LS3A-RS780E-1-way-machi.patch
|
||||
features/mips/MIPS-octeon-Add-support-for-the-UBNT-E200-board.patch
|
||||
features/x86/x86-memtest-WARN-if-bad-RAM-found.patch
|
||||
features/x86/x86-make-x32-syscall-support-conditional.patch
|
||||
|
|
|
|||
Loading…
Reference in New Issue