diff options
author | Felix Fietkau <nbd@nbd.name> | 2016-05-12 17:54:14 +0200 |
---|---|---|
committer | Felix Fietkau <nbd@nbd.name> | 2016-05-12 17:54:14 +0200 |
commit | 3f1705d7770d6ff42f369ff7856fb047c8b78e42 (patch) | |
tree | 0ea8bec363bceb3d1f237afb771b9906ba98f34a /target/linux/bcm53xx/patches-4.1/070-ARM-l2c-restore-the-behaviour-documented-above-l2c_e.patch | |
parent | b9c6361d5f6f47149c99b02c2c00e91e0729aec9 (diff) | |
download | mtk-20170518-3f1705d7770d6ff42f369ff7856fb047c8b78e42.zip mtk-20170518-3f1705d7770d6ff42f369ff7856fb047c8b78e42.tar.gz mtk-20170518-3f1705d7770d6ff42f369ff7856fb047c8b78e42.tar.bz2 |
bcm53xx: delete old kernel versions
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/bcm53xx/patches-4.1/070-ARM-l2c-restore-the-behaviour-documented-above-l2c_e.patch')
-rw-r--r-- | target/linux/bcm53xx/patches-4.1/070-ARM-l2c-restore-the-behaviour-documented-above-l2c_e.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/target/linux/bcm53xx/patches-4.1/070-ARM-l2c-restore-the-behaviour-documented-above-l2c_e.patch b/target/linux/bcm53xx/patches-4.1/070-ARM-l2c-restore-the-behaviour-documented-above-l2c_e.patch deleted file mode 100644 index abee99d..0000000 --- a/target/linux/bcm53xx/patches-4.1/070-ARM-l2c-restore-the-behaviour-documented-above-l2c_e.patch +++ /dev/null @@ -1,43 +0,0 @@ -From d965b0fca7dcde3f82c982e0bf1631069fdeb8c9 Mon Sep 17 00:00:00 2001 -From: Russell King <rmk+kernel@arm.linux.org.uk> -Date: Fri, 15 May 2015 11:56:45 +0100 -Subject: [PATCH 70/74] ARM: l2c: restore the behaviour documented above - l2c_enable() - -l2c_enable() is documented that it must not be called if the cache has -already been enabled. Unfortunately, commit 6b49241ac252 ("ARM: 8259/1: -l2c: Refactor the driver to use commit-like interface") changed this -without updating the comment, for very little reason. Revert this -change and restore the expected behaviour. - -Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> ---- - arch/arm/mm/cache-l2x0.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - ---- a/arch/arm/mm/cache-l2x0.c -+++ b/arch/arm/mm/cache-l2x0.c -@@ -129,10 +129,6 @@ static void l2c_enable(void __iomem *bas - { - unsigned long flags; - -- /* Do not touch the controller if already enabled. */ -- if (readl_relaxed(base + L2X0_CTRL) & L2X0_CTRL_EN) -- return; -- - l2x0_saved_regs.aux_ctrl = aux; - l2c_configure(base); - -@@ -163,7 +159,11 @@ static void l2c_save(void __iomem *base) - - static void l2c_resume(void) - { -- l2c_enable(l2x0_base, l2x0_saved_regs.aux_ctrl, l2x0_data->num_lock); -+ void __iomem *base = l2x0_base; -+ -+ /* Do not touch the controller if already enabled. */ -+ if (!(readl_relaxed(base + L2X0_CTRL) & L2X0_CTRL_EN)) -+ l2c_enable(base, l2x0_saved_regs.aux_ctrl, l2x0_data->num_lock); - } - - /* |