Skip to content

Commit b4d2e02

Browse files
cristibirsancristibirsan
committed
Merge branch 'stable/linux-4.14.y' into linux-4.14-at91
2 parents 9aa9469 + 2cc4d36 commit b4d2e02

170 files changed

Lines changed: 1013 additions & 605 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,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 4
33
PATCHLEVEL = 14
4-
SUBLEVEL = 71
4+
SUBLEVEL = 72
55
EXTRAVERSION =
66
NAME = Petit Gorille
77

‎arch/arm/boot/dts/qcom-msm8974-lge-nexus5-hammerhead.dts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,8 @@
189189
regulator-max-microvolt = <2950000>;
190190

191191
regulator-boot-on;
192+
regulator-system-load = <200000>;
193+
regulator-allow-set-load;
192194
};
193195

194196
l21 {

‎arch/arm/mach-exynos/suspend.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@ static int __init exynos_pmu_irq_init(struct device_node *node,
209209
NULL);
210210
if (!domain) {
211211
iounmap(pmu_base_addr);
212+
pmu_base_addr = NULL;
212213
return -ENOMEM;
213214
}
214215

‎arch/arm/mach-hisi/hotplug.c‎

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -148,13 +148,20 @@ static int hi3xxx_hotplug_init(void)
148148
struct device_node *node;
149149

150150
node = of_find_compatible_node(NULL, NULL, "hisilicon,sysctrl");
151-
if (node) {
152-
ctrl_base = of_iomap(node, 0);
153-
id = HI3620_CTRL;
154-
return 0;
151+
if (!node) {
152+
id = ERROR_CTRL;
153+
return -ENOENT;
155154
}
156-
id = ERROR_CTRL;
157-
return -ENOENT;
155+
156+
ctrl_base = of_iomap(node, 0);
157+
of_node_put(node);
158+
if (!ctrl_base) {
159+
id = ERROR_CTRL;
160+
return -ENOMEM;
161+
}
162+
163+
id = HI3620_CTRL;
164+
return 0;
158165
}
159166

160167
void hi3xxx_set_cpu(int cpu, bool enable)
@@ -173,11 +180,15 @@ static bool hix5hd2_hotplug_init(void)
173180
struct device_node *np;
174181

175182
np = of_find_compatible_node(NULL, NULL, "hisilicon,cpuctrl");
176-
if (np) {
177-
ctrl_base = of_iomap(np, 0);
178-
return true;
179-
}
180-
return false;
183+
if (!np)
184+
return false;
185+
186+
ctrl_base = of_iomap(np, 0);
187+
of_node_put(np);
188+
if (!ctrl_base)
189+
return false;
190+
191+
return true;
181192
}
182193

183194
void hix5hd2_set_cpu(int cpu, bool enable)
@@ -219,10 +230,10 @@ void hip01_set_cpu(int cpu, bool enable)
219230

220231
if (!ctrl_base) {
221232
np = of_find_compatible_node(NULL, NULL, "hisilicon,hip01-sysctrl");
222-
if (np)
223-
ctrl_base = of_iomap(np, 0);
224-
else
225-
BUG();
233+
BUG_ON(!np);
234+
ctrl_base = of_iomap(np, 0);
235+
of_node_put(np);
236+
BUG_ON(!ctrl_base);
226237
}
227238

228239
if (enable) {

‎arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@
187187
led@6 {
188188
label = "apq8016-sbc:blue:bt";
189189
gpios = <&pm8916_mpps 3 GPIO_ACTIVE_HIGH>;
190-
linux,default-trigger = "bt";
190+
linux,default-trigger = "bluetooth-power";
191191
default-state = "off";
192192
};
193193
};

‎arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
clocks = <&sys_clk 32>;
5656
enable-method = "psci";
5757
operating-points-v2 = <&cluster0_opp>;
58+
#cooling-cells = <2>;
5859
};
5960

6061
cpu2: cpu@100 {
@@ -73,6 +74,7 @@
7374
clocks = <&sys_clk 33>;
7475
enable-method = "psci";
7576
operating-points-v2 = <&cluster1_opp>;
77+
#cooling-cells = <2>;
7678
};
7779
};
7880

‎arch/arm64/kernel/ptrace.c‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -274,19 +274,22 @@ static int ptrace_hbp_set_event(unsigned int note_type,
274274

275275
switch (note_type) {
276276
case NT_ARM_HW_BREAK:
277-
if (idx < ARM_MAX_BRP) {
278-
tsk->thread.debug.hbp_break[idx] = bp;
279-
err = 0;
280-
}
277+
if (idx >= ARM_MAX_BRP)
278+
goto out;
279+
idx = array_index_nospec(idx, ARM_MAX_BRP);
280+
tsk->thread.debug.hbp_break[idx] = bp;
281+
err = 0;
281282
break;
282283
case NT_ARM_HW_WATCH:
283-
if (idx < ARM_MAX_WRP) {
284-
tsk->thread.debug.hbp_watch[idx] = bp;
285-
err = 0;
286-
}
284+
if (idx >= ARM_MAX_WRP)
285+
goto out;
286+
idx = array_index_nospec(idx, ARM_MAX_WRP);
287+
tsk->thread.debug.hbp_watch[idx] = bp;
288+
err = 0;
287289
break;
288290
}
289291

292+
out:
290293
return err;
291294
}
292295

‎arch/mips/ath79/setup.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ static char ath79_sys_type[ATH79_SYS_TYPE_LEN];
4040

4141
static void ath79_restart(char *command)
4242
{
43+
local_irq_disable();
4344
ath79_device_reset_set(AR71XX_RESET_FULL_CHIP);
4445
for (;;)
4546
if (cpu_wait)

‎arch/mips/include/asm/mach-ath79/ath79.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ static inline u32 ath79_pll_rr(unsigned reg)
134134
static inline void ath79_reset_wr(unsigned reg, u32 val)
135135
{
136136
__raw_writel(val, ath79_reset_base + reg);
137+
(void) __raw_readl(ath79_reset_base + reg); /* flush */
137138
}
138139

139140
static inline u32 ath79_reset_rr(unsigned reg)

‎arch/mips/jz4740/Platform‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
platform-$(CONFIG_MACH_INGENIC) += jz4740/
22
cflags-$(CONFIG_MACH_INGENIC) += -I$(srctree)/arch/mips/include/asm/mach-jz4740
33
load-$(CONFIG_MACH_INGENIC) += 0xffffffff80010000
4-
zload-$(CONFIG_MACH_INGENIC) += 0xffffffff80600000
4+
zload-$(CONFIG_MACH_INGENIC) += 0xffffffff81000000

0 commit comments

Comments
 (0)