kernel: update 4.1 to 4.1.10

[openwrt/openwrt.git] / target / linux / brcm2708 / patches-4.1 / 0001-Main-bcm2708-bcm2709-linux-port.patch

diff --git a/target/linux/brcm2708/patches-4.1/0001-Main-bcm2708-bcm2709-linux-port.patch b/target/linux/brcm2708/patches-4.1/0001-Main-bcm2708-bcm2709-linux-port.patch
index 80ad8c3461649e3f8b184ece659918c4bf14f2ba..79891f850419b6d9e54a3bd6b5fa4ffc769dcb29 100644 (file)
--- a/target/linux/brcm2708/patches-4.1/0001-Main-bcm2708-bcm2709-linux-port.patch
+++ b/target/linux/brcm2708/patches-4.1/0001-Main-bcm2708-bcm2709-linux-port.patch
@@ -168,7 +168,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
  config ARCH_MULTIPLATFORM
        bool "Allow multiple platforms to be selected"
        depends on MMU
-@@ -823,6 +859,9 @@ config ARCH_VIRT
+@@ -824,6 +860,9 @@ config ARCH_VIRT
  # Kconfigs may be included either alphabetically (according to the
  # plat- suffix) or along side the corresponding mach-* source.
  #
@@ -6745,7 +6745,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
  ENTRY(cpu_v6_dcache_clean_area)
 --- a/arch/arm/mm/proc-v7.S
 +++ b/arch/arm/mm/proc-v7.S
-@@ -456,6 +456,7 @@ __v7_setup:
+@@ -460,6 +460,7 @@ __v7_setup_cont:
        orr     r0, r0, r6                      @ set them
   THUMB(       orr     r0, r0, #1 << 30        )       @ Thumb exceptions
        ret     lr                              @ return to head.S:__ret