Skip to content

Commit 4d4de98

Browse files
arter97arter97
committed
Merge tag 'v4.14.233'
This is the 4.14.233 stable release Signed-off-by: Park Ju Hyung <[email protected]>
2 parents c5c57c4 + 96afcb2 commit 4d4de98

File tree

366 files changed

+2520
-1507
lines changed

Some content is hidden

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

366 files changed

+2520
-1507
lines changed

Diff for: ‎Makefile

+1-1
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 = 231
4+
SUBLEVEL = 233
55
EXTRAVERSION =
66
NAME = Petit Gorille
77

Diff for: ‎arch/arc/kernel/entry.S

+2-2
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ tracesys:
169169

170170
; Do the Sys Call as we normally would.
171171
; Validate the Sys Call number
172-
cmp r8, NR_syscalls
172+
cmp r8, NR_syscalls - 1
173173
mov.hi r0, -ENOSYS
174174
bhi tracesys_exit
175175

@@ -252,7 +252,7 @@ ENTRY(EV_Trap)
252252
;============ Normal syscall case
253253

254254
; syscall num shd not exceed the total system calls avail
255-
cmp r8, NR_syscalls
255+
cmp r8, NR_syscalls - 1
256256
mov.hi r0, -ENOSYS
257257
bhi .Lret_from_system_call
258258

Diff for: ‎arch/arc/kernel/signal.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ stash_usr_regs(struct rt_sigframe __user *sf, struct pt_regs *regs,
9999
sizeof(sf->uc.uc_mcontext.regs.scratch));
100100
err |= __copy_to_user(&sf->uc.uc_sigmask, set, sizeof(sigset_t));
101101

102-
return err;
102+
return err ? -EFAULT : 0;
103103
}
104104

105105
static int restore_usr_regs(struct pt_regs *regs, struct rt_sigframe __user *sf)
@@ -113,7 +113,7 @@ static int restore_usr_regs(struct pt_regs *regs, struct rt_sigframe __user *sf)
113113
&(sf->uc.uc_mcontext.regs.scratch),
114114
sizeof(sf->uc.uc_mcontext.regs.scratch));
115115
if (err)
116-
return err;
116+
return -EFAULT;
117117

118118
set_current_blocked(&set);
119119
regs->bta = uregs.scratch.bta;

Diff for: ‎arch/arm/boot/dts/exynos4412-odroid-common.dtsi

+1-1
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@
265265
max77686: pmic@09 {
266266
compatible = "maxim,max77686";
267267
interrupt-parent = <&gpx3>;
268-
interrupts = <2 IRQ_TYPE_NONE>;
268+
interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
269269
pinctrl-names = "default";
270270
pinctrl-0 = <&max77686_irq>;
271271
reg = <0x09>;

Diff for: ‎arch/arm/boot/dts/exynos5250-smdk5250.dts

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
compatible = "maxim,max77686";
134134
reg = <0x09>;
135135
interrupt-parent = <&gpx3>;
136-
interrupts = <2 IRQ_TYPE_NONE>;
136+
interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
137137
pinctrl-names = "default";
138138
pinctrl-0 = <&max77686_irq>;
139139
wakeup-source;

Diff for: ‎arch/arm/boot/dts/exynos5250-snow-common.dtsi

+1-1
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@
284284
max77686: max77686@09 {
285285
compatible = "maxim,max77686";
286286
interrupt-parent = <&gpx3>;
287-
interrupts = <2 IRQ_TYPE_NONE>;
287+
interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
288288
pinctrl-names = "default";
289289
pinctrl-0 = <&max77686_irq>;
290290
wakeup-source;

Diff for: ‎arch/arm/boot/dts/omap3.dtsi

+3
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
i2c0 = &i2c1;
2424
i2c1 = &i2c2;
2525
i2c2 = &i2c3;
26+
mmc0 = &mmc1;
27+
mmc1 = &mmc2;
28+
mmc2 = &mmc3;
2629
serial0 = &uart1;
2730
serial1 = &uart2;
2831
serial2 = &uart3;

Diff for: ‎arch/arm/boot/dts/omap4.dtsi

+5
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@
2222
i2c1 = &i2c2;
2323
i2c2 = &i2c3;
2424
i2c3 = &i2c4;
25+
mmc0 = &mmc1;
26+
mmc1 = &mmc2;
27+
mmc2 = &mmc3;
28+
mmc3 = &mmc4;
29+
mmc4 = &mmc5;
2530
serial0 = &uart1;
2631
serial1 = &uart2;
2732
serial2 = &uart3;

Diff for: ‎arch/arm/boot/dts/omap5.dtsi

+5
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@
2525
i2c2 = &i2c3;
2626
i2c3 = &i2c4;
2727
i2c4 = &i2c5;
28+
mmc0 = &mmc1;
29+
mmc1 = &mmc2;
30+
mmc2 = &mmc3;
31+
mmc3 = &mmc4;
32+
mmc4 = &mmc5;
2833
serial0 = &uart1;
2934
serial1 = &uart2;
3035
serial2 = &uart3;

Diff for: ‎arch/arm/kernel/hw_breakpoint.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -903,7 +903,7 @@ static void breakpoint_handler(unsigned long unknown, struct pt_regs *regs)
903903
info->trigger = addr;
904904
pr_debug("breakpoint fired: address = 0x%x\n", addr);
905905
perf_bp_event(bp, regs);
906-
if (!bp->overflow_handler)
906+
if (is_default_overflow_handler(bp))
907907
enable_single_step(bp, addr);
908908
goto unlock;
909909
}

Diff for: ‎arch/arm/kernel/suspend.c

+18-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// SPDX-License-Identifier: GPL-2.0
2+
#include <linux/ftrace.h>
23
#include <linux/init.h>
34
#include <linux/slab.h>
45
#include <linux/mm_types.h>
@@ -26,13 +27,23 @@ int cpu_suspend(unsigned long arg, int (*fn)(unsigned long))
2627
if (!idmap_pgd)
2728
return -EINVAL;
2829

30+
/*
31+
* Function graph tracer state gets incosistent when the kernel
32+
* calls functions that never return (aka suspend finishers) hence
33+
* disable graph tracing during their execution.
34+
*/
35+
pause_graph_tracing();
36+
2937
/*
3038
* Provide a temporary page table with an identity mapping for
3139
* the MMU-enable code, required for resuming. On successful
3240
* resume (indicated by a zero return code), we need to switch
3341
* back to the correct page tables.
3442
*/
3543
ret = __cpu_suspend(arg, fn, __mpidr);
44+
45+
unpause_graph_tracing();
46+
3647
if (ret == 0) {
3748
cpu_switch_mm(mm->pgd, mm);
3849
local_flush_bp_all();
@@ -46,7 +57,13 @@ int cpu_suspend(unsigned long arg, int (*fn)(unsigned long))
4657
int cpu_suspend(unsigned long arg, int (*fn)(unsigned long))
4758
{
4859
u32 __mpidr = cpu_logical_map(smp_processor_id());
49-
return __cpu_suspend(arg, fn, __mpidr);
60+
int ret;
61+
62+
pause_graph_tracing();
63+
ret = __cpu_suspend(arg, fn, __mpidr);
64+
unpause_graph_tracing();
65+
66+
return ret;
5067
}
5168
#define idmap_pgd NULL
5269
#endif

Diff for: ‎arch/arm/mach-footbridge/cats-pci.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
#include <asm/mach-types.h>
1616

1717
/* cats host-specific stuff */
18-
static int irqmap_cats[] __initdata = { IRQ_PCI, IRQ_IN0, IRQ_IN1, IRQ_IN3 };
18+
static int irqmap_cats[] = { IRQ_PCI, IRQ_IN0, IRQ_IN1, IRQ_IN3 };
1919

2020
static u8 cats_no_swizzle(struct pci_dev *dev, u8 *pin)
2121
{
2222
return 0;
2323
}
2424

25-
static int __init cats_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
25+
static int cats_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
2626
{
2727
if (dev->irq >= 255)
2828
return -1; /* not a valid interrupt. */

Diff for: ‎arch/arm/mach-footbridge/ebsa285-pci.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
#include <asm/mach/pci.h>
1515
#include <asm/mach-types.h>
1616

17-
static int irqmap_ebsa285[] __initdata = { IRQ_IN3, IRQ_IN1, IRQ_IN0, IRQ_PCI };
17+
static int irqmap_ebsa285[] = { IRQ_IN3, IRQ_IN1, IRQ_IN0, IRQ_PCI };
1818

19-
static int __init ebsa285_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
19+
static int ebsa285_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
2020
{
2121
if (dev->vendor == PCI_VENDOR_ID_CONTAQ &&
2222
dev->device == PCI_DEVICE_ID_CONTAQ_82C693)

Diff for: ‎arch/arm/mach-footbridge/netwinder-pci.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* We now use the slot ID instead of the device identifiers to select
1919
* which interrupt is routed where.
2020
*/
21-
static int __init netwinder_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
21+
static int netwinder_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
2222
{
2323
switch (slot) {
2424
case 0: /* host bridge */

Diff for: ‎arch/arm/mach-footbridge/personal-pci.c

+2-3
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@
1414
#include <asm/mach/pci.h>
1515
#include <asm/mach-types.h>
1616

17-
static int irqmap_personal_server[] __initdata = {
17+
static int irqmap_personal_server[] = {
1818
IRQ_IN0, IRQ_IN1, IRQ_IN2, IRQ_IN3, 0, 0, 0,
1919
IRQ_DOORBELLHOST, IRQ_DMA1, IRQ_DMA2, IRQ_PCI
2020
};
2121

22-
static int __init personal_server_map_irq(const struct pci_dev *dev, u8 slot,
23-
u8 pin)
22+
static int personal_server_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
2423
{
2524
unsigned char line;
2625

Diff for: ‎arch/arm/mach-keystone/keystone.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ static void __init keystone_init(void)
6565
static long long __init keystone_pv_fixup(void)
6666
{
6767
long long offset;
68-
phys_addr_t mem_start, mem_end;
68+
u64 mem_start, mem_end;
6969

7070
mem_start = memblock_start_of_DRAM();
7171
mem_end = memblock_end_of_DRAM();
@@ -78,7 +78,7 @@ static long long __init keystone_pv_fixup(void)
7878
if (mem_start < KEYSTONE_HIGH_PHYS_START ||
7979
mem_end > KEYSTONE_HIGH_PHYS_END) {
8080
pr_crit("Invalid address space for memory (%08llx-%08llx)\n",
81-
(u64)mem_start, (u64)mem_end);
81+
mem_start, mem_end);
8282
return 0;
8383
}
8484

Diff for: ‎arch/arm/probes/uprobes/core.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -207,15 +207,15 @@ unsigned long uprobe_get_swbp_addr(struct pt_regs *regs)
207207
static struct undef_hook uprobes_arm_break_hook = {
208208
.instr_mask = 0x0fffffff,
209209
.instr_val = (UPROBE_SWBP_ARM_INSN & 0x0fffffff),
210-
.cpsr_mask = MODE_MASK,
210+
.cpsr_mask = (PSR_T_BIT | MODE_MASK),
211211
.cpsr_val = USR_MODE,
212212
.fn = uprobe_trap_handler,
213213
};
214214

215215
static struct undef_hook uprobes_arm_ss_hook = {
216216
.instr_mask = 0x0fffffff,
217217
.instr_val = (UPROBE_SS_ARM_INSN & 0x0fffffff),
218-
.cpsr_mask = MODE_MASK,
218+
.cpsr_mask = (PSR_T_BIT | MODE_MASK),
219219
.cpsr_val = USR_MODE,
220220
.fn = uprobe_trap_handler,
221221
};

Diff for: ‎arch/arm64/boot/dts/mediatek/mt8173.dtsi

+1-1
Original file line numberDiff line numberDiff line change
@@ -1029,7 +1029,7 @@
10291029
<&mmsys CLK_MM_DSI1_DIGITAL>,
10301030
<&mipi_tx1>;
10311031
clock-names = "engine", "digital", "hs";
1032-
phy = <&mipi_tx1>;
1032+
phys = <&mipi_tx1>;
10331033
phy-names = "dphy";
10341034
status = "disabled";
10351035
};

Diff for: ‎arch/arm64/include/asm/alternative.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,9 @@ void apply_alternatives(void *start, size_t length);
114114
.popsection
115115
.subsection 1
116116
663: \insn2
117-
664: .previous
118-
.org . - (664b-663b) + (662b-661b)
117+
664: .org . - (664b-663b) + (662b-661b)
119118
.org . - (662b-661b) + (664b-663b)
119+
.previous
120120
.endif
121121
.endm
122122

@@ -186,11 +186,11 @@ void apply_alternatives(void *start, size_t length);
186186
*/
187187
.macro alternative_endif
188188
664:
189+
.org . - (664b-663b) + (662b-661b)
190+
.org . - (662b-661b) + (664b-663b)
189191
.if .Lasm_alt_mode==0
190192
.previous
191193
.endif
192-
.org . - (664b-663b) + (662b-661b)
193-
.org . - (662b-661b) + (664b-663b)
194194
.endm
195195

196196
/*

Diff for: ‎arch/arm64/include/asm/word-at-a-time.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -64,17 +64,17 @@ static inline unsigned long find_zero(unsigned long mask)
6464
*/
6565
static inline unsigned long load_unaligned_zeropad(const void *addr)
6666
{
67-
unsigned long ret, offset;
67+
unsigned long ret, tmp;
6868

6969
/* Load word from unaligned pointer addr */
7070
asm(
7171
"1: ldr %0, %3\n"
7272
"2:\n"
7373
" .pushsection .fixup,\"ax\"\n"
7474
" .align 2\n"
75-
"3: and %1, %2, #0x7\n"
76-
" bic %2, %2, #0x7\n"
77-
" ldr %0, [%2]\n"
75+
"3: bic %1, %2, #0x7\n"
76+
" ldr %0, [%1]\n"
77+
" and %1, %2, #0x7\n"
7878
" lsl %1, %1, #0x3\n"
7979
#ifndef __AARCH64EB__
8080
" lsr %0, %0, %1\n"
@@ -84,7 +84,7 @@ static inline unsigned long load_unaligned_zeropad(const void *addr)
8484
" b 2b\n"
8585
" .popsection\n"
8686
_ASM_EXTABLE(1b, 3b)
87-
: "=&r" (ret), "=&r" (offset)
87+
: "=&r" (ret), "=&r" (tmp)
8888
: "r" (addr), "Q" (*(unsigned long *)addr));
8989

9090
return ret;

Diff for: ‎arch/arm64/kernel/vdso/vdso.lds.S

+7-1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,13 @@ SECTIONS
3939
.gnu.version_d : { *(.gnu.version_d) }
4040
.gnu.version_r : { *(.gnu.version_r) }
4141

42+
/*
43+
* Discard .note.gnu.property sections which are unused and have
44+
* different alignment requirement from vDSO note sections.
45+
*/
46+
/DISCARD/ : {
47+
*(.note.GNU-stack .note.gnu.property)
48+
}
4249
.note : { *(.note.*) } :text :note
4350

4451
. = ALIGN(16);
@@ -59,7 +66,6 @@ SECTIONS
5966
PROVIDE(end = .);
6067

6168
/DISCARD/ : {
62-
*(.note.GNU-stack)
6369
*(.data .data.* .gnu.linkonce.d.* .sdata*)
6470
*(.bss .sbss .dynbss .dynsbss)
6571
}

Diff for: ‎arch/ia64/mm/discontig.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ static int __init build_node_maps(unsigned long start, unsigned long len,
100100
* acpi_boot_init() (which builds the node_to_cpu_mask array) hasn't been
101101
* called yet. Note that node 0 will also count all non-existent cpus.
102102
*/
103-
static int __meminit early_nr_cpus_node(int node)
103+
static int early_nr_cpus_node(int node)
104104
{
105105
int cpu, n = 0;
106106

@@ -115,7 +115,7 @@ static int __meminit early_nr_cpus_node(int node)
115115
* compute_pernodesize - compute size of pernode data
116116
* @node: the node id.
117117
*/
118-
static unsigned long __meminit compute_pernodesize(int node)
118+
static unsigned long compute_pernodesize(int node)
119119
{
120120
unsigned long pernodesize = 0, cpus;
121121

@@ -412,7 +412,7 @@ static void __init reserve_pernode_space(void)
412412
}
413413
}
414414

415-
static void __meminit scatter_node_data(void)
415+
static void scatter_node_data(void)
416416
{
417417
pg_data_t **dst;
418418
int node;

Diff for: ‎arch/mips/include/asm/cpu-features.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
#include <asm/cpu.h>
1313
#include <asm/cpu-info.h>
14+
#include <asm/isa-rev.h>
1415
#include <cpu-feature-overrides.h>
1516

1617
/*
@@ -493,7 +494,7 @@
493494
# define cpu_has_perf (cpu_data[0].options & MIPS_CPU_PERF)
494495
#endif
495496

496-
#if defined(CONFIG_SMP) && defined(__mips_isa_rev) && (__mips_isa_rev >= 6)
497+
#if defined(CONFIG_SMP) && (MIPS_ISA_REV >= 6)
497498
/*
498499
* Some systems share FTLB RAMs between threads within a core (siblings in
499500
* kernel parlance). This means that FTLB entries may become invalid at almost
@@ -525,7 +526,7 @@
525526
# define cpu_has_shared_ftlb_entries \
526527
(current_cpu_data.options & MIPS_CPU_SHARED_FTLB_ENTRIES)
527528
# endif
528-
#endif /* SMP && __mips_isa_rev >= 6 */
529+
#endif /* SMP && MIPS_ISA_REV >= 6 */
529530

530531
#ifndef cpu_has_shared_ftlb_ram
531532
# define cpu_has_shared_ftlb_ram 0

0 commit comments

Comments
 (0)