Skip to content

Commit 2a35610

Browse files
mdrjrmdrjr
committed
Merge tag 'v5.4.114' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroid-5.4.y
This is the 5.4.114 stable release Change-Id: If571acb2eb4ea49bb17319eaf7363ee8daf308ee
2 parents 190518a + a7eb81c commit 2a35610

73 files changed

Lines changed: 617 additions & 359 deletions

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 = 5
33
PATCHLEVEL = 4
4-
SUBLEVEL = 113
4+
SUBLEVEL = 114
55
EXTRAVERSION =
66
NAME = Kleptomaniac Octopus
77

‎arch/arc/kernel/signal.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ stash_usr_regs(struct rt_sigframe __user *sf, struct pt_regs *regs,
9696
sizeof(sf->uc.uc_mcontext.regs.scratch));
9797
err |= __copy_to_user(&sf->uc.uc_sigmask, set, sizeof(sigset_t));
9898

99-
return err;
99+
return err ? -EFAULT : 0;
100100
}
101101

102102
static int restore_usr_regs(struct pt_regs *regs, struct rt_sigframe __user *sf)
@@ -110,7 +110,7 @@ static int restore_usr_regs(struct pt_regs *regs, struct rt_sigframe __user *sf)
110110
&(sf->uc.uc_mcontext.regs.scratch),
111111
sizeof(sf->uc.uc_mcontext.regs.scratch));
112112
if (err)
113-
return err;
113+
return -EFAULT;
114114

115115
set_current_blocked(&set);
116116
regs->bta = uregs.scratch.bta;

‎arch/arm/boot/dts/omap4.dtsi‎

Lines changed: 5 additions & 0 deletions
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;

‎arch/arm/boot/dts/omap44xx-clocks.dtsi‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -770,14 +770,6 @@
770770
ti,max-div = <2>;
771771
};
772772

773-
sha2md5_fck: sha2md5_fck@15c8 {
774-
#clock-cells = <0>;
775-
compatible = "ti,gate-clock";
776-
clocks = <&l3_div_ck>;
777-
ti,bit-shift = <1>;
778-
reg = <0x15c8>;
779-
};
780-
781773
usb_phy_cm_clk32k: usb_phy_cm_clk32k@640 {
782774
#clock-cells = <0>;
783775
compatible = "ti,gate-clock";

‎arch/arm/boot/dts/omap5.dtsi‎

Lines changed: 5 additions & 0 deletions
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;

‎arch/arm/mach-footbridge/cats-pci.c‎

Lines changed: 2 additions & 2 deletions
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. */

‎arch/arm/mach-footbridge/ebsa285-pci.c‎

Lines changed: 2 additions & 2 deletions
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)

‎arch/arm/mach-footbridge/netwinder-pci.c‎

Lines changed: 1 addition & 1 deletion
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 */

‎arch/arm/mach-footbridge/personal-pci.c‎

Lines changed: 2 additions & 3 deletions
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

‎arch/arm/mach-keystone/keystone.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ static void __init keystone_init(void)
6262
static long long __init keystone_pv_fixup(void)
6363
{
6464
long long offset;
65-
phys_addr_t mem_start, mem_end;
65+
u64 mem_start, mem_end;
6666

6767
mem_start = memblock_start_of_DRAM();
6868
mem_end = memblock_end_of_DRAM();
@@ -75,7 +75,7 @@ static long long __init keystone_pv_fixup(void)
7575
if (mem_start < KEYSTONE_HIGH_PHYS_START ||
7676
mem_end > KEYSTONE_HIGH_PHYS_END) {
7777
pr_crit("Invalid address space for memory (%08llx-%08llx)\n",
78-
(u64)mem_start, (u64)mem_end);
78+
mem_start, mem_end);
7979
return 0;
8080
}
8181

0 commit comments

Comments
 (0)