ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-25 08:21:14 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

kernel: Update kernel 4.9 to version 4.9.240

Browse Source 
Compile and runtime tested on ar71xx/generic.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Hauke Mehrtens 2020-10-16 22:16:07 +02:00
parent 27677af27c
commit edda06c7b4
25 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-version.mk
View File

@ -2,10 +2,10 @@
LINUX_RELEASE?=1 LINUX_RELEASE?=1
LINUX_VERSION-4.9 = .237 LINUX_VERSION-4.9 = .240
LINUX_VERSION-4.14 = .199 LINUX_VERSION-4.14 = .199
LINUX_KERNEL_HASH-4.9.237 = 81ec5792c0ccdc244faff9dbb3d9c97857d9df4cb1f0c1c3db6bc4031faf861f LINUX_KERNEL_HASH-4.9.240 = 06e470c66988da200ae95dc5d5fdfd1e1f8611e8c3445620e3566ecd0bdf776f
LINUX_KERNEL_HASH-4.14.199 = 02f3432a262b3804745501f8c3c51d735133af48a39909df8b031d0b9653d4f9 LINUX_KERNEL_HASH-4.14.199 = 02f3432a262b3804745501f8c3c51d735133af48a39909df8b031d0b9653d4f9
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))

14
target/linux/ar71xx/patches-4.9/403-mtd_fix_cfi_cmdset_0002_status_check.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/mtd/chips/cfi_cmdset_0002.c --- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -1637,7 +1637,7 @@ static int __xipram do_write_oneword(str @@ -1636,7 +1636,7 @@ static int __xipram do_write_oneword(str
} }
if (chip_good(map, adr, datum)) if (chip_good(map, adr, datum))
@ -9,7 +9,7 @@
/* Latency issues. Drop the lock, wait a while and retry */ /* Latency issues. Drop the lock, wait a while and retry */
UDELAY(map, chip, adr, 1); UDELAY(map, chip, adr, 1);
@@ -1654,6 +1654,8 @@ static int __xipram do_write_oneword(str @@ -1653,6 +1653,8 @@ static int __xipram do_write_oneword(str
goto retry; goto retry;
} }
} }
@ -18,7 +18,7 @@
xip_enable(map, chip, adr); xip_enable(map, chip, adr);
op_done: op_done:
if (mode == FL_OTP_WRITE) if (mode == FL_OTP_WRITE)
@@ -2236,7 +2238,6 @@ static int cfi_amdstd_panic_write(struct @@ -2235,7 +2237,6 @@ static int cfi_amdstd_panic_write(struct
return 0; return 0;
} }
@ -26,7 +26,7 @@
/* /*
* Handle devices with one erase region, that only implement * Handle devices with one erase region, that only implement
* the chip erase command. * the chip erase command.
@@ -2304,7 +2305,7 @@ static int __xipram do_erase_chip(struct @@ -2303,7 +2304,7 @@ static int __xipram do_erase_chip(struct
} }
if (chip_good(map, adr, map_word_ff(map))) if (chip_good(map, adr, map_word_ff(map)))
@ -35,7 +35,7 @@
if (time_after(jiffies, timeo)) { if (time_after(jiffies, timeo)) {
printk(KERN_WARNING "MTD %s(): software timeout\n", printk(KERN_WARNING "MTD %s(): software timeout\n",
@@ -2328,6 +2329,7 @@ static int __xipram do_erase_chip(struct @@ -2327,6 +2328,7 @@ static int __xipram do_erase_chip(struct
} }
} }
@ -43,7 +43,7 @@
chip->state = FL_READY; chip->state = FL_READY;
xip_enable(map, chip, adr); xip_enable(map, chip, adr);
DISABLE_VPP(map); DISABLE_VPP(map);
@@ -2401,7 +2403,7 @@ static int __xipram do_erase_oneblock(st @@ -2400,7 +2402,7 @@ static int __xipram do_erase_oneblock(st
if (chip_good(map, adr, map_word_ff(map))) { if (chip_good(map, adr, map_word_ff(map))) {
xip_enable(map, chip, adr); xip_enable(map, chip, adr);
@ -52,7 +52,7 @@
} }
if (time_after(jiffies, timeo)) { if (time_after(jiffies, timeo)) {
@@ -2427,6 +2429,7 @@ static int __xipram do_erase_oneblock(st @@ -2426,6 +2428,7 @@ static int __xipram do_erase_oneblock(st
} }
} }

6
target/linux/ar71xx/patches-4.9/411-mtd-cfi_cmdset_0002-force-word-write.patch
View File

@ -35,7 +35,7 @@
/* Atmel chips don't use the same PRI format as AMD chips */ /* Atmel chips don't use the same PRI format as AMD chips */
static void fixup_convert_atmel_pri(struct mtd_info *mtd) static void fixup_convert_atmel_pri(struct mtd_info *mtd)
@@ -1796,6 +1800,7 @@ static int cfi_amdstd_write_words(struct @@ -1795,6 +1799,7 @@ static int cfi_amdstd_write_words(struct
/* /*
* FIXME: interleaved mode not tested, and probably not supported! * FIXME: interleaved mode not tested, and probably not supported!
*/ */
@ -43,7 +43,7 @@
static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
unsigned long adr, const u_char *buf, unsigned long adr, const u_char *buf,
int len) int len)
@@ -1928,7 +1933,6 @@ static int __xipram do_write_buffer(stru @@ -1927,7 +1932,6 @@ static int __xipram do_write_buffer(stru
return ret; return ret;
} }
@ -51,7 +51,7 @@
static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len, static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len,
size_t *retlen, const u_char *buf) size_t *retlen, const u_char *buf)
{ {
@@ -2003,6 +2007,7 @@ static int cfi_amdstd_write_buffers(stru @@ -2002,6 +2006,7 @@ static int cfi_amdstd_write_buffers(stru
return 0; return 0;
} }

2
target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch
View File

@ -316,7 +316,7 @@
for (p = *head; p; p = p->next) { for (p = *head; p; p = p->next) {
--- a/net/ipv4/route.c --- a/net/ipv4/route.c
+++ b/net/ipv4/route.c +++ b/net/ipv4/route.c
@@ -459,7 +459,7 @@ static struct neighbour *ipv4_neigh_look @@ -460,7 +460,7 @@ static struct neighbour *ipv4_neigh_look
else if (skb) else if (skb)
pkey = &ip_hdr(skb)->daddr; pkey = &ip_hdr(skb)->daddr;

4
target/linux/generic/backport-4.9/030-01-ubifs-Drop-softlimit-and-delta-fields-from-struct-ub.patch
View File

@ -21,7 +21,7 @@ Signed-off-by: Richard Weinberger <richard@nod.at>
--- a/fs/ubifs/io.c --- a/fs/ubifs/io.c
+++ b/fs/ubifs/io.c +++ b/fs/ubifs/io.c
@@ -452,16 +452,22 @@ static enum hrtimer_restart wbuf_timer_c @@ -464,16 +464,22 @@ static enum hrtimer_restart wbuf_timer_c
*/ */
static void new_wbuf_timer_nolock(struct ubifs_wbuf *wbuf) static void new_wbuf_timer_nolock(struct ubifs_wbuf *wbuf)
{ {
@ -48,7 +48,7 @@ Signed-off-by: Richard Weinberger <richard@nod.at>
HRTIMER_MODE_REL); HRTIMER_MODE_REL);
} }
@@ -1059,10 +1065,6 @@ int ubifs_wbuf_init(struct ubifs_info *c @@ -1071,10 +1077,6 @@ int ubifs_wbuf_init(struct ubifs_info *c
hrtimer_init(&wbuf->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); hrtimer_init(&wbuf->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
wbuf->timer.function = wbuf_timer_callback_nolock; wbuf->timer.function = wbuf_timer_callback_nolock;

2
target/linux/generic/backport-4.9/030-02-ubifs-Use-dirty_writeback_interval-value-for-wbuf-ti.patch
View File

@ -35,7 +35,7 @@ Signed-off-by: Richard Weinberger <richard@nod.at>
--- a/fs/ubifs/io.c --- a/fs/ubifs/io.c
+++ b/fs/ubifs/io.c +++ b/fs/ubifs/io.c
@@ -452,11 +452,11 @@ static enum hrtimer_restart wbuf_timer_c @@ -464,11 +464,11 @@ static enum hrtimer_restart wbuf_timer_c
*/ */
static void new_wbuf_timer_nolock(struct ubifs_wbuf *wbuf) static void new_wbuf_timer_nolock(struct ubifs_wbuf *wbuf)
{ {

2
target/linux/generic/backport-4.9/040-mm-add-support-for-releasing-multiple-instances-of-a.patch
View File

@ -52,7 +52,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
extern void __free_page_frag(void *addr); extern void __free_page_frag(void *addr);
--- a/mm/page_alloc.c --- a/mm/page_alloc.c
+++ b/mm/page_alloc.c +++ b/mm/page_alloc.c
@@ -3941,6 +3941,20 @@ static struct page *__page_frag_refill(s @@ -3942,6 +3942,20 @@ static struct page *__page_frag_refill(s
return page; return page;
} }

6
target/linux/generic/backport-4.9/041-mm-rename-__alloc_page_frag-to-page_frag_alloc-and-_.patch
View File

@ -52,7 +52,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
#define free_page(addr) free_pages((addr), 0) #define free_page(addr) free_pages((addr), 0)
--- a/include/linux/skbuff.h --- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h +++ b/include/linux/skbuff.h
@@ -2477,7 +2477,7 @@ static inline struct sk_buff *netdev_all @@ -2489,7 +2489,7 @@ static inline struct sk_buff *netdev_all
static inline void skb_free_frag(void *addr) static inline void skb_free_frag(void *addr)
{ {
@ -63,7 +63,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
void *napi_alloc_frag(unsigned int fragsz); void *napi_alloc_frag(unsigned int fragsz);
--- a/mm/page_alloc.c --- a/mm/page_alloc.c
+++ b/mm/page_alloc.c +++ b/mm/page_alloc.c
@@ -3955,8 +3955,8 @@ void __page_frag_drain(struct page *page @@ -3956,8 +3956,8 @@ void __page_frag_drain(struct page *page
} }
EXPORT_SYMBOL(__page_frag_drain); EXPORT_SYMBOL(__page_frag_drain);
@ -74,7 +74,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
{ {
unsigned int size = PAGE_SIZE; unsigned int size = PAGE_SIZE;
struct page *page; struct page *page;
@@ -4007,19 +4007,19 @@ refill: @@ -4008,19 +4008,19 @@ refill:
return nc->va + offset; return nc->va + offset;
} }

6
target/linux/generic/backport-4.9/042-mm-rename-__page_frag-functions-to-__page_frag_cache.patch
View File

@ -33,7 +33,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
extern void page_frag_free(void *addr); extern void page_frag_free(void *addr);
--- a/mm/page_alloc.c --- a/mm/page_alloc.c
+++ b/mm/page_alloc.c +++ b/mm/page_alloc.c
@@ -3920,8 +3920,8 @@ EXPORT_SYMBOL(free_pages); @@ -3921,8 +3921,8 @@ EXPORT_SYMBOL(free_pages);
* drivers to provide a backing region of memory for use as either an * drivers to provide a backing region of memory for use as either an
* sk_buff->head, or to be used in the "frags" portion of skb_shared_info. * sk_buff->head, or to be used in the "frags" portion of skb_shared_info.
*/ */
@ -44,7 +44,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
{ {
struct page *page = NULL; struct page *page = NULL;
gfp_t gfp = gfp_mask; gfp_t gfp = gfp_mask;
@@ -3941,19 +3941,20 @@ static struct page *__page_frag_refill(s @@ -3942,19 +3942,20 @@ static struct page *__page_frag_refill(s
return page; return page;
} }
@ -68,7 +68,7 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
void *page_frag_alloc(struct page_frag_cache *nc, void *page_frag_alloc(struct page_frag_cache *nc,
unsigned int fragsz, gfp_t gfp_mask) unsigned int fragsz, gfp_t gfp_mask)
@@ -3964,7 +3965,7 @@ void *page_frag_alloc(struct page_frag_c @@ -3965,7 +3966,7 @@ void *page_frag_alloc(struct page_frag_c
if (unlikely(!nc->va)) { if (unlikely(!nc->va)) {
refill: refill:

2
target/linux/generic/backport-4.9/075-v4.10-0004-net-phy-broadcom-Add-BCM54810-PHY-entry.patch
View File

@ -126,7 +126,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
{ PHY_ID_BCM50610M, 0xfffffff0 }, { PHY_ID_BCM50610M, 0xfffffff0 },
--- a/drivers/net/phy/Kconfig --- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig
@@ -204,7 +204,7 @@ config BROADCOM_PHY @@ -205,7 +205,7 @@ config BROADCOM_PHY
select BCM_NET_PHYLIB select BCM_NET_PHYLIB
---help--- ---help---
Currently supports the BCM5411, BCM5421, BCM5461, BCM54616S, BCM5464, Currently supports the BCM5411, BCM5421, BCM5461, BCM54616S, BCM5464,

2
target/linux/generic/hack-4.9/700-swconfig_switch_drivers.patch
View File

@ -12,7 +12,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/drivers/net/phy/Kconfig --- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig
@@ -147,6 +147,89 @@ config MDIO_XGENE @@ -148,6 +148,89 @@ config MDIO_XGENE
This module provides a driver for the MDIO busses found in the This module provides a driver for the MDIO busses found in the
APM X-Gene SoC's. APM X-Gene SoC's.

2
target/linux/generic/hack-4.9/702-phy_add_aneg_done_function.patch
View File

@ -15,7 +15,7 @@
--- a/drivers/net/phy/phy_device.c --- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c
@@ -1320,6 +1320,9 @@ int genphy_update_link(struct phy_device @@ -1321,6 +1321,9 @@ int genphy_update_link(struct phy_device
{ {
int status; int status;

2
target/linux/generic/hack-4.9/710-phy-add-mdio_register_board_info.patch
View File

@ -76,7 +76,7 @@
* @__phy_drivers: array of PHY drivers to register * @__phy_drivers: array of PHY drivers to register
--- a/drivers/net/phy/Kconfig --- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig
@@ -149,6 +149,10 @@ config MDIO_XGENE @@ -150,6 +150,10 @@ config MDIO_XGENE
comment "Switch configuration API + drivers" comment "Switch configuration API + drivers"

4
target/linux/generic/hack-4.9/721-phy_packets.patch
View File

@ -56,7 +56,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
*/ */
--- a/include/linux/skbuff.h --- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h +++ b/include/linux/skbuff.h
@@ -2340,6 +2340,10 @@ static inline int pskb_trim(struct sk_bu @@ -2352,6 +2352,10 @@ static inline int pskb_trim(struct sk_bu
return (len < skb->len) ? __pskb_trim(skb, len) : 0; return (len < skb->len) ? __pskb_trim(skb, len) : 0;
} }
@ -67,7 +67,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/** /**
* pskb_trim_unique - remove end from a paged unique (not cloned) buffer * pskb_trim_unique - remove end from a paged unique (not cloned) buffer
* @skb: buffer to alter * @skb: buffer to alter
@@ -2460,16 +2464,6 @@ static inline struct sk_buff *dev_alloc_ @@ -2472,16 +2476,6 @@ static inline struct sk_buff *dev_alloc_
} }

2
target/linux/generic/hack-4.9/902-debloat_proc.patch
View File

@ -394,7 +394,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/ipv4/route.c --- a/net/ipv4/route.c
+++ b/net/ipv4/route.c +++ b/net/ipv4/route.c
@@ -421,6 +421,9 @@ static struct pernet_operations ip_rt_pr @@ -422,6 +422,9 @@ static struct pernet_operations ip_rt_pr
static int __init ip_rt_proc_init(void) static int __init ip_rt_proc_init(void)
{ {

2
target/linux/generic/pending-4.9/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch
View File

@ -71,7 +71,7 @@ Signed-off-by: Tobias Wolf <dev-NTEO@vplace.de>
--- a/mm/page_alloc.c --- a/mm/page_alloc.c
+++ b/mm/page_alloc.c +++ b/mm/page_alloc.c
@@ -5931,7 +5931,7 @@ static void __ref alloc_node_mem_map(str @@ -5932,7 +5932,7 @@ static void __ref alloc_node_mem_map(str
mem_map = NODE_DATA(0)->node_mem_map; mem_map = NODE_DATA(0)->node_mem_map;
#if defined(CONFIG_HAVE_MEMBLOCK_NODE_MAP) || defined(CONFIG_FLATMEM) #if defined(CONFIG_HAVE_MEMBLOCK_NODE_MAP) || defined(CONFIG_FLATMEM)
if (page_to_pfn(mem_map) != pgdat->node_start_pfn) if (page_to_pfn(mem_map) != pgdat->node_start_pfn)

2
target/linux/generic/pending-4.9/460-mtd-cfi_cmdset_0002-no-erase_suspend.patch
View File

@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/drivers/mtd/chips/cfi_cmdset_0002.c --- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -807,7 +807,7 @@ static int get_chip(struct map_info *map @@ -806,7 +806,7 @@ static int get_chip(struct map_info *map
return 0; return 0;
case FL_ERASING: case FL_ERASING:

2
target/linux/generic/pending-4.9/461-mtd-cfi_cmdset_0002-add-buffer-write-cmd-timeout.patch
View File

@ -7,7 +7,7 @@ Signed-off-by: George Kashperko <george@znau.edu.ua>
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
--- a/drivers/mtd/chips/cfi_cmdset_0002.c --- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -1835,6 +1835,7 @@ static int __xipram do_write_buffer(stru @@ -1834,6 +1834,7 @@ static int __xipram do_write_buffer(stru
/* Write Buffer Load */ /* Write Buffer Load */
map_write(map, CMD(0x25), cmd_adr); map_write(map, CMD(0x25), cmd_adr);

8
target/linux/generic/pending-4.9/630-packet_socket_type.patch
View File

@ -71,7 +71,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (!net_eq(dev_net(dev), sock_net(sk))) if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop; goto drop;
@@ -2175,12 +2177,12 @@ static int tpacket_rcv(struct sk_buff *s @@ -2176,12 +2178,12 @@ static int tpacket_rcv(struct sk_buff *s
BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h2)) != 32); BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h2)) != 32);
BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h3)) != 48); BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h3)) != 48);
@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (!net_eq(dev_net(dev), sock_net(sk))) if (!net_eq(dev_net(dev), sock_net(sk)))
goto drop; goto drop;
@@ -3298,6 +3300,7 @@ static int packet_create(struct net *net @@ -3305,6 +3307,7 @@ static int packet_create(struct net *net
mutex_init(&po->pg_vec_lock); mutex_init(&po->pg_vec_lock);
po->rollover = NULL; po->rollover = NULL;
po->prot_hook.func = packet_rcv; po->prot_hook.func = packet_rcv;
@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (sock->type == SOCK_PACKET) if (sock->type == SOCK_PACKET)
po->prot_hook.func = packet_rcv_spkt; po->prot_hook.func = packet_rcv_spkt;
@@ -3920,6 +3923,16 @@ packet_setsockopt(struct socket *sock, i @@ -3927,6 +3930,16 @@ packet_setsockopt(struct socket *sock, i
po->xmit = val ? packet_direct_xmit : dev_queue_xmit; po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
return 0; return 0;
} }
@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
default: default:
return -ENOPROTOOPT; return -ENOPROTOOPT;
} }
@@ -3972,6 +3985,13 @@ static int packet_getsockopt(struct sock @@ -3979,6 +3992,13 @@ static int packet_getsockopt(struct sock
case PACKET_VNET_HDR: case PACKET_VNET_HDR:
val = po->has_vnet_hdr; val = po->has_vnet_hdr;
break; break;

2
target/linux/generic/pending-4.9/655-increase_skb_pad.patch
View File

@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/include/linux/skbuff.h --- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h +++ b/include/linux/skbuff.h
@@ -2304,7 +2304,7 @@ static inline int pskb_network_may_pull( @@ -2316,7 +2316,7 @@ static inline int pskb_network_may_pull(
* NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8) * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
*/ */
#ifndef NET_SKB_PAD #ifndef NET_SKB_PAD

10
target/linux/generic/pending-4.9/834-ledtrig-libata.patch
View File

@ -65,7 +65,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
/** /**
* ata_build_rw_tf - Build ATA taskfile for given read/write request * ata_build_rw_tf - Build ATA taskfile for given read/write request
* @tf: Target ATA taskfile * @tf: Target ATA taskfile
@@ -4996,6 +5009,9 @@ struct ata_queued_cmd *ata_qc_new_init(s @@ -4999,6 +5012,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
if (tag < 0) if (tag < 0)
return NULL; return NULL;
} }
@ -75,7 +75,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
qc = __ata_qc_from_tag(ap, tag); qc = __ata_qc_from_tag(ap, tag);
qc->tag = tag; qc->tag = tag;
@@ -5897,6 +5913,9 @@ struct ata_port *ata_port_alloc(struct a @@ -5902,6 +5918,9 @@ struct ata_port *ata_port_alloc(struct a
ap->stats.unhandled_irq = 1; ap->stats.unhandled_irq = 1;
ap->stats.idle_irq = 1; ap->stats.idle_irq = 1;
#endif #endif
@ -85,7 +85,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
ata_sff_port_init(ap); ata_sff_port_init(ap);
return ap; return ap;
@@ -5918,6 +5937,12 @@ static void ata_host_release(struct devi @@ -5923,6 +5942,12 @@ static void ata_host_release(struct devi
kfree(ap->pmp_link); kfree(ap->pmp_link);
kfree(ap->slave_link); kfree(ap->slave_link);
@ -98,7 +98,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
kfree(ap); kfree(ap);
host->ports[i] = NULL; host->ports[i] = NULL;
} }
@@ -6364,7 +6389,23 @@ int ata_host_register(struct ata_host *h @@ -6369,7 +6394,23 @@ int ata_host_register(struct ata_host *h
host->ports[i]->print_id = atomic_inc_return(&ata_print_id); host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
host->ports[i]->local_port_no = i + 1; host->ports[i]->local_port_no = i + 1;
} }
@ -134,7 +134,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
/* /*
* Define if arch has non-standard setup. This is a _PCI_ standard * Define if arch has non-standard setup. This is a _PCI_ standard
@@ -888,6 +891,12 @@ struct ata_port { @@ -889,6 +892,12 @@ struct ata_port {
#ifdef CONFIG_ATA_ACPI #ifdef CONFIG_ATA_ACPI
struct ata_acpi_gtm __acpi_init_gtm; /* use ata_acpi_init_gtm() */ struct ata_acpi_gtm __acpi_init_gtm; /* use ata_acpi_init_gtm() */
#endif #endif

4
target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch
View File

@ -105,7 +105,7 @@
case UPIO_AU: case UPIO_AU:
p->serial_out(p, offset, value); p->serial_out(p, offset, value);
p->serial_in(p, UART_LCR); /* safe, no side-effects */ p->serial_in(p, UART_LCR); /* safe, no side-effects */
@@ -2766,6 +2786,7 @@ static int serial8250_request_std_resour @@ -2780,6 +2800,7 @@ static int serial8250_request_std_resour
case UPIO_MEM32BE: case UPIO_MEM32BE:
case UPIO_MEM16: case UPIO_MEM16:
case UPIO_MEM: case UPIO_MEM:
@ -113,7 +113,7 @@
if (!port->mapbase) if (!port->mapbase)
break; break;
@@ -2804,6 +2825,7 @@ static void serial8250_release_std_resou @@ -2818,6 +2839,7 @@ static void serial8250_release_std_resou
case UPIO_MEM32BE: case UPIO_MEM32BE:
case UPIO_MEM16: case UPIO_MEM16:
case UPIO_MEM: case UPIO_MEM:

2
target/linux/layerscape/patches-4.9/202-core-linux-support-layerscape.patch
View File

@ -384,7 +384,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
void __kfree_skb(struct sk_buff *skb); void __kfree_skb(struct sk_buff *skb);
extern struct kmem_cache *skbuff_head_cache; extern struct kmem_cache *skbuff_head_cache;
@@ -3083,6 +3084,7 @@ static inline void skb_free_datagram_loc @@ -3095,6 +3096,7 @@ static inline void skb_free_datagram_loc
} }
int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags); int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags);
int skb_copy_bits(const struct sk_buff *skb, int offset, void *to, int len); int skb_copy_bits(const struct sk_buff *skb, int offset, void *to, int len);

8
target/linux/layerscape/patches-4.9/703-phy-support-layerscape.patch
View File

@ -42,7 +42,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
config MDIO_GPIO config MDIO_GPIO
tristate "GPIO lib-based bitbanged MDIO buses" tristate "GPIO lib-based bitbanged MDIO buses"
depends on MDIO_BITBANG && GPIOLIB depends on MDIO_BITBANG && GPIOLIB
@@ -298,6 +304,11 @@ config CICADA_PHY @@ -299,6 +305,11 @@ config CICADA_PHY
---help--- ---help---
Currently supports the cis8204 Currently supports the cis8204
@ -1695,7 +1695,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
EXPORT_SYMBOL(phy_ethtool_get_wol); EXPORT_SYMBOL(phy_ethtool_get_wol);
--- a/drivers/net/phy/phy_device.c --- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c
@@ -1054,7 +1054,7 @@ int phy_suspend(struct phy_device *phyde @@ -1055,7 +1055,7 @@ int phy_suspend(struct phy_device *phyde
if (wol.wolopts) if (wol.wolopts)
return -EBUSY; return -EBUSY;
@ -1704,7 +1704,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
ret = phydrv->suspend(phydev); ret = phydrv->suspend(phydev);
if (ret) if (ret)
@@ -1071,7 +1071,7 @@ int phy_resume(struct phy_device *phydev @@ -1072,7 +1072,7 @@ int phy_resume(struct phy_device *phydev
struct phy_driver *phydrv = to_phy_driver(phydev->mdio.dev.driver); struct phy_driver *phydrv = to_phy_driver(phydev->mdio.dev.driver);
int ret = 0; int ret = 0;
@ -1713,7 +1713,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
ret = phydrv->resume(phydev); ret = phydrv->resume(phydev);
if (ret) if (ret)
@@ -1728,7 +1728,7 @@ static int phy_remove(struct device *dev @@ -1729,7 +1729,7 @@ static int phy_remove(struct device *dev
phydev->state = PHY_DOWN; phydev->state = PHY_DOWN;
mutex_unlock(&phydev->lock); mutex_unlock(&phydev->lock);

10
target/linux/uml/patches-4.9/101-mconsole-exec.patch
View File

@ -151,7 +151,7 @@
#endif /* __LINUX_KMOD_H__ */ #endif /* __LINUX_KMOD_H__ */
--- a/kernel/kmod.c --- a/kernel/kmod.c
+++ b/kernel/kmod.c +++ b/kernel/kmod.c
@@ -39,6 +39,7 @@ @@ -40,6 +40,7 @@
#include <linux/rwsem.h> #include <linux/rwsem.h>
#include <linux/ptrace.h> #include <linux/ptrace.h>
#include <linux/async.h> #include <linux/async.h>
@ -159,7 +159,7 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <trace/events/module.h> #include <trace/events/module.h>
@@ -222,6 +223,28 @@ static int call_usermodehelper_exec_asyn @@ -223,6 +224,28 @@ static int call_usermodehelper_exec_asyn
flush_signal_handlers(current, 1); flush_signal_handlers(current, 1);
spin_unlock_irq(&current->sighand->siglock); spin_unlock_irq(&current->sighand->siglock);
@ -186,9 +186,9 @@
+ } + }
+ +
/* /*
* Our parent (unbound workqueue) runs with elevated scheduling * Initial kernel threads share ther FS with init, in order to
* priority. Avoid propagating that into the userspace child. * get the init root directory. But we've now created a new
@@ -540,6 +563,20 @@ struct subprocess_info *call_usermodehel @@ -549,6 +572,20 @@ struct subprocess_info *call_usermodehel
} }
EXPORT_SYMBOL(call_usermodehelper_setup); EXPORT_SYMBOL(call_usermodehelper_setup);