kernel: update 3.10 to 3.10.32
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 39707
This commit is contained in:
@@ -13,7 +13,7 @@ FEATURES:=squashfs
|
||||
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
|
||||
SUBTARGETS=generic harddisk
|
||||
|
||||
LINUX_VERSION:=3.10.28
|
||||
LINUX_VERSION:=3.10.32
|
||||
|
||||
include $(INCLUDE_DIR)/target.mk
|
||||
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
if (!port->mapbase)
|
||||
break;
|
||||
|
||||
@@ -3091,6 +3113,7 @@ static int serial8250_probe(struct platf
|
||||
@@ -3095,6 +3117,7 @@ static int serial8250_probe(struct platf
|
||||
uart.port.set_termios = p->set_termios;
|
||||
uart.port.pm = p->pm;
|
||||
uart.port.dev = &dev->dev;
|
||||
@@ -65,7 +65,7 @@
|
||||
uart.port.irqflags |= irqflag;
|
||||
ret = serial8250_register_8250_port(&uart);
|
||||
if (ret < 0) {
|
||||
@@ -3242,6 +3265,7 @@ int serial8250_register_8250_port(struct
|
||||
@@ -3246,6 +3269,7 @@ int serial8250_register_8250_port(struct
|
||||
uart->port.flags = up->port.flags | UPF_BOOT_AUTOCONF;
|
||||
uart->bugs = up->bugs;
|
||||
uart->port.mapbase = up->port.mapbase;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/net/core/skbuff.c
|
||||
+++ b/net/core/skbuff.c
|
||||
@@ -238,6 +238,9 @@ struct sk_buff *__alloc_skb(unsigned int
|
||||
@@ -208,6 +208,9 @@ struct sk_buff *__alloc_skb(unsigned int
|
||||
|
||||
if (sk_memalloc_socks() && (flags & SKB_ALLOC_RX))
|
||||
gfp_mask |= __GFP_MEMALLOC;
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
/* Get the HEAD */
|
||||
skb = kmem_cache_alloc_node(cache, gfp_mask & ~__GFP_DMA, node);
|
||||
@@ -1082,6 +1085,10 @@ int pskb_expand_head(struct sk_buff *skb
|
||||
@@ -1052,6 +1055,10 @@ int pskb_expand_head(struct sk_buff *skb
|
||||
if (skb_shared(skb))
|
||||
BUG();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user