Skip to content

Commit 2ea8423

Browse files
noglitchnoglitch
committed
Merge tag 'v4.9.87' into linux-4.9-at91
This is the 4.9.87 stable release
2 parents da0a491 + b674162 commit 2ea8423

128 files changed

Lines changed: 1181 additions & 375 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
VERSION = 4
22
PATCHLEVEL = 9
3-
SUBLEVEL = 85
3+
SUBLEVEL = 87
44
EXTRAVERSION = -linux4sam_5.8-rc2
55
NAME = Roaring Lionus
66

‎arch/arm/boot/dts/logicpd-som-lv.dtsi‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@
9797
};
9898

9999
&i2c1 {
100+
pinctrl-names = "default";
101+
pinctrl-0 = <&i2c1_pins>;
100102
clock-frequency = <2600000>;
101103

102104
twl: twl@48 {
@@ -215,7 +217,12 @@
215217
>;
216218
};
217219

218-
220+
i2c1_pins: pinmux_i2c1_pins {
221+
pinctrl-single,pins = <
222+
OMAP3_CORE1_IOPAD(0x21ba, PIN_INPUT | MUX_MODE0) /* i2c1_scl.i2c1_scl */
223+
OMAP3_CORE1_IOPAD(0x21bc, PIN_INPUT | MUX_MODE0) /* i2c1_sda.i2c1_sda */
224+
>;
225+
};
219226
};
220227

221228
&omap3_pmx_wkup {

‎arch/arm/boot/dts/logicpd-torpedo-som.dtsi‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,8 @@
100100
};
101101

102102
&i2c1 {
103+
pinctrl-names = "default";
104+
pinctrl-0 = <&i2c1_pins>;
103105
clock-frequency = <2600000>;
104106

105107
twl: twl@48 {
@@ -207,6 +209,12 @@
207209
OMAP3_CORE1_IOPAD(0x21b8, PIN_INPUT | MUX_MODE0) /* hsusb0_data7.hsusb0_data7 */
208210
>;
209211
};
212+
i2c1_pins: pinmux_i2c1_pins {
213+
pinctrl-single,pins = <
214+
OMAP3_CORE1_IOPAD(0x21ba, PIN_INPUT | MUX_MODE0) /* i2c1_scl.i2c1_scl */
215+
OMAP3_CORE1_IOPAD(0x21bc, PIN_INPUT | MUX_MODE0) /* i2c1_sda.i2c1_sda */
216+
>;
217+
};
210218
};
211219

212220
&uart2 {

‎arch/arm/boot/dts/ls1021a-qds.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@
215215
reg = <0x2a>;
216216
VDDA-supply = <&reg_3p3v>;
217217
VDDIO-supply = <&reg_3p3v>;
218-
clocks = <&sys_mclk 1>;
218+
clocks = <&sys_mclk>;
219219
};
220220
};
221221
};

‎arch/arm/boot/dts/ls1021a-twr.dts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@
187187
reg = <0x0a>;
188188
VDDA-supply = <&reg_3p3v>;
189189
VDDIO-supply = <&reg_3p3v>;
190-
clocks = <&sys_mclk 1>;
190+
clocks = <&sys_mclk>;
191191
};
192192
};
193193

‎arch/arm/kvm/hyp/Makefile‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ ccflags-y += -fno-stack-protector -DDISABLE_BRANCH_PROFILING
66

77
KVM=../../../../virt/kvm
88

9+
CFLAGS_ARMV7VE :=$(call cc-option, -march=armv7ve)
10+
911
obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/vgic-v2-sr.o
1012
obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/vgic-v3-sr.o
1113
obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/timer-sr.o
@@ -14,7 +16,10 @@ obj-$(CONFIG_KVM_ARM_HOST) += tlb.o
1416
obj-$(CONFIG_KVM_ARM_HOST) += cp15-sr.o
1517
obj-$(CONFIG_KVM_ARM_HOST) += vfp.o
1618
obj-$(CONFIG_KVM_ARM_HOST) += banked-sr.o
19+
CFLAGS_banked-sr.o += $(CFLAGS_ARMV7VE)
20+
1721
obj-$(CONFIG_KVM_ARM_HOST) += entry.o
1822
obj-$(CONFIG_KVM_ARM_HOST) += hyp-entry.o
1923
obj-$(CONFIG_KVM_ARM_HOST) += switch.o
24+
CFLAGS_switch.o += $(CFLAGS_ARMV7VE)
2025
obj-$(CONFIG_KVM_ARM_HOST) += s2-setup.o

‎arch/arm/kvm/hyp/banked-sr.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020

2121
#include <asm/kvm_hyp.h>
2222

23+
/*
24+
* gcc before 4.9 doesn't understand -march=armv7ve, so we have to
25+
* trick the assembler.
26+
*/
2327
__asm__(".arch_extension virt");
2428

2529
void __hyp_text __banked_save_state(struct kvm_cpu_context *ctxt)

‎arch/arm/kvm/mmu.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1284,7 +1284,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
12841284
return -EFAULT;
12851285
}
12861286

1287-
if (vma_kernel_pagesize(vma) && !logging_active) {
1287+
if (vma_kernel_pagesize(vma) == PMD_SIZE && !logging_active) {
12881288
hugetlb = true;
12891289
gfn = (fault_ipa & PMD_MASK) >> PAGE_SHIFT;
12901290
} else {

‎arch/arm/lib/csumpartialcopyuser.S‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,11 @@
8585
.pushsection .text.fixup,"ax"
8686
.align 4
8787
9001: mov r4, #-EFAULT
88+
#ifdef CONFIG_CPU_SW_DOMAIN_PAN
89+
ldr r5, [sp, #9*4] @ *err_ptr
90+
#else
8891
ldr r5, [sp, #8*4] @ *err_ptr
92+
#endif
8993
str r4, [r5]
9094
ldmia sp, {r1, r2} @ retrieve dst, len
9195
add r2, r2, r1

‎arch/arm/mach-mvebu/Kconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ config MACH_ARMADA_375
4242
depends on ARCH_MULTI_V7
4343
select ARMADA_370_XP_IRQ
4444
select ARM_ERRATA_720789
45-
select ARM_ERRATA_753970
45+
select PL310_ERRATA_753970
4646
select ARM_GIC
4747
select ARMADA_375_CLK
4848
select HAVE_ARM_SCU
@@ -58,7 +58,7 @@ config MACH_ARMADA_38X
5858
bool "Marvell Armada 380/385 boards"
5959
depends on ARCH_MULTI_V7
6060
select ARM_ERRATA_720789
61-
select ARM_ERRATA_753970
61+
select PL310_ERRATA_753970
6262
select ARM_GIC
6363
select ARMADA_370_XP_IRQ
6464
select ARMADA_38X_CLK

0 commit comments

Comments
 (0)