aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/brcm2708')
-rw-r--r--target/linux/brcm2708/patches-4.14/950-0037-Add-dwc_otg-driver.patch2
-rw-r--r--target/linux/brcm2708/patches-4.14/950-0061-Improve-__copy_to_user-and-__copy_from_user-performa.patch2
-rw-r--r--target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch6
-rw-r--r--target/linux/brcm2708/patches-4.14/950-0294-net-phy-add-unlocked-accessors.patch4
-rw-r--r--target/linux/brcm2708/patches-4.14/950-0295-net-phy-add-paged-phy-register-accessors.patch4
5 files changed, 9 insertions, 9 deletions
diff --git a/target/linux/brcm2708/patches-4.14/950-0037-Add-dwc_otg-driver.patch b/target/linux/brcm2708/patches-4.14/950-0037-Add-dwc_otg-driver.patch
index fc86e81902..5cb3fffcc0 100644
--- a/target/linux/brcm2708/patches-4.14/950-0037-Add-dwc_otg-driver.patch
+++ b/target/linux/brcm2708/patches-4.14/950-0037-Add-dwc_otg-driver.patch
@@ -841,7 +841,7 @@ Signed-off-by: Malik Olivier Boussejra <malik@boussejra.com>
}
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
-@@ -5112,7 +5112,7 @@ static void port_event(struct usb_hub *h
+@@ -5116,7 +5116,7 @@ static void port_event(struct usb_hub *h
if (portchange & USB_PORT_STAT_C_OVERCURRENT) {
u16 status = 0, unused;
diff --git a/target/linux/brcm2708/patches-4.14/950-0061-Improve-__copy_to_user-and-__copy_from_user-performa.patch b/target/linux/brcm2708/patches-4.14/950-0061-Improve-__copy_to_user-and-__copy_from_user-performa.patch
index b8f7de202d..1045733b63 100644
--- a/target/linux/brcm2708/patches-4.14/950-0061-Improve-__copy_to_user-and-__copy_from_user-performa.patch
+++ b/target/linux/brcm2708/patches-4.14/950-0061-Improve-__copy_to_user-and-__copy_from_user-performa.patch
@@ -279,7 +279,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
ENDPROC(arm_copy_from_user)
+ENDPROC(__copy_from_user_std)
- .pushsection .fixup,"ax"
+ .pushsection .text.fixup,"ax"
.align 0
--- /dev/null
+++ b/arch/arm/lib/exports_rpi.c
diff --git a/target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch b/target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch
index 6aefcb5052..ec964531cb 100644
--- a/target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch
+++ b/target/linux/brcm2708/patches-4.14/950-0136-cgroup-Disable-cgroup-memory-by-default.patch
@@ -17,7 +17,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
-@@ -5207,6 +5207,8 @@ int __init cgroup_init_early(void)
+@@ -5220,6 +5220,8 @@ int __init cgroup_init_early(void)
}
static u16 cgroup_disable_mask __initdata;
@@ -26,7 +26,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
/**
* cgroup_init - cgroup initialization
-@@ -5245,6 +5247,12 @@ int __init cgroup_init(void)
+@@ -5258,6 +5260,12 @@ int __init cgroup_init(void)
mutex_unlock(&cgroup_mutex);
@@ -39,7 +39,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
for_each_subsys(ss, ssid) {
if (ss->early_init) {
struct cgroup_subsys_state *css =
-@@ -5636,6 +5644,28 @@ static int __init cgroup_disable(char *s
+@@ -5649,6 +5657,28 @@ static int __init cgroup_disable(char *s
}
__setup("cgroup_disable=", cgroup_disable);
diff --git a/target/linux/brcm2708/patches-4.14/950-0294-net-phy-add-unlocked-accessors.patch b/target/linux/brcm2708/patches-4.14/950-0294-net-phy-add-unlocked-accessors.patch
index f0b916e86c..9a6dc179e9 100644
--- a/target/linux/brcm2708/patches-4.14/950-0294-net-phy-add-unlocked-accessors.patch
+++ b/target/linux/brcm2708/patches-4.14/950-0294-net-phy-add-unlocked-accessors.patch
@@ -53,7 +53,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
+EXPORT_SYMBOL_GPL(__phy_modify);
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
-@@ -726,6 +726,18 @@ static inline int phy_read(struct phy_de
+@@ -728,6 +728,18 @@ static inline int phy_read(struct phy_de
}
/**
@@ -72,7 +72,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
* phy_write - Convenience function for writing a given PHY register
* @phydev: the phy_device struct
* @regnum: register number to write
-@@ -741,6 +753,22 @@ static inline int phy_write(struct phy_d
+@@ -743,6 +755,22 @@ static inline int phy_write(struct phy_d
}
/**
diff --git a/target/linux/brcm2708/patches-4.14/950-0295-net-phy-add-paged-phy-register-accessors.patch b/target/linux/brcm2708/patches-4.14/950-0295-net-phy-add-paged-phy-register-accessors.patch
index 51866b4485..b1da67fea2 100644
--- a/target/linux/brcm2708/patches-4.14/950-0295-net-phy-add-paged-phy-register-accessors.patch
+++ b/target/linux/brcm2708/patches-4.14/950-0295-net-phy-add-paged-phy-register-accessors.patch
@@ -181,7 +181,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
+EXPORT_SYMBOL(phy_modify_paged);
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
-@@ -644,6 +644,9 @@ struct phy_driver {
+@@ -646,6 +646,9 @@ struct phy_driver {
int (*write_mmd)(struct phy_device *dev, int devnum, u16 regnum,
u16 val);
@@ -191,7 +191,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* Get the size and type of the eeprom contained within a plug-in
* module */
int (*module_info)(struct phy_device *dev,
-@@ -832,6 +835,14 @@ static inline bool phy_is_pseudo_fixed_l
+@@ -834,6 +837,14 @@ static inline bool phy_is_pseudo_fixed_l
*/
int phy_write_mmd(struct phy_device *phydev, int devad, u32 regnum, u16 val);