kernel: update kernel 4.4 to version 4.4.19
Refresh patches for all targets that support kernel 4.4. Compile-tested on all targets that use kernel 4.4 and aren't marked broken. Runtime-tested on ar71xx, octeon and x86/64. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
This commit is contained in:
@@ -359,7 +359,7 @@
|
||||
#define BCMA_CORE_ARM_CA7 0x847
|
||||
#define BCMA_CORE_SYS_MEM 0x849
|
||||
#define BCMA_CORE_DEFAULT 0xFFF
|
||||
@@ -199,6 +201,7 @@ struct bcma_host_ops {
|
||||
@@ -200,6 +202,7 @@ struct bcma_host_ops {
|
||||
#define BCMA_PKG_ID_BCM4707 1
|
||||
#define BCMA_PKG_ID_BCM4708 2
|
||||
#define BCMA_PKG_ID_BCM4709 0
|
||||
@@ -470,7 +470,7 @@
|
||||
extern u32 bcma_chipco_get_alp_clock(struct bcma_drv_cc *cc);
|
||||
--- a/drivers/bcma/bcma_private.h
|
||||
+++ b/drivers/bcma/bcma_private.h
|
||||
@@ -47,10 +47,6 @@ int bcma_sprom_get(struct bcma_bus *bus)
|
||||
@@ -45,10 +45,6 @@ int bcma_sprom_get(struct bcma_bus *bus)
|
||||
void bcma_core_chipcommon_early_init(struct bcma_drv_cc *cc);
|
||||
void bcma_core_chipcommon_init(struct bcma_drv_cc *cc);
|
||||
void bcma_chipco_bcm4331_ext_pa_lines_ctl(struct bcma_drv_cc *cc, bool enable);
|
||||
@@ -481,7 +481,7 @@
|
||||
|
||||
/* driver_chipcommon_b.c */
|
||||
int bcma_core_chipcommon_b_init(struct bcma_drv_cc_b *ccb);
|
||||
@@ -62,6 +58,21 @@ void bcma_pmu_init(struct bcma_drv_cc *c
|
||||
@@ -60,6 +56,21 @@ void bcma_pmu_init(struct bcma_drv_cc *c
|
||||
u32 bcma_pmu_get_alp_clock(struct bcma_drv_cc *cc);
|
||||
u32 bcma_pmu_get_cpu_clock(struct bcma_drv_cc *cc);
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ Signed-off-by: Richard Weinberger <richard@nod.at>
|
||||
|
||||
--- a/fs/ubifs/super.c
|
||||
+++ b/fs/ubifs/super.c
|
||||
@@ -2108,8 +2108,9 @@ static struct dentry *ubifs_mount(struct file_system_type *fs_type, int flags,
|
||||
@@ -2107,8 +2107,9 @@ static struct dentry *ubifs_mount(struct
|
||||
*/
|
||||
ubi = open_ubi(name, UBI_READONLY);
|
||||
if (IS_ERR(ubi)) {
|
||||
|
||||
@@ -16,7 +16,7 @@ Signed-off-by: Richard Weinberger <richard@nod.at>
|
||||
|
||||
--- a/fs/ubifs/super.c
|
||||
+++ b/fs/ubifs/super.c
|
||||
@@ -520,19 +520,19 @@ static int init_constants_early(struct ubifs_info *c)
|
||||
@@ -520,19 +520,19 @@ static int init_constants_early(struct u
|
||||
c->max_write_shift = fls(c->max_write_size) - 1;
|
||||
|
||||
if (c->leb_size < UBIFS_MIN_LEB_SZ) {
|
||||
@@ -41,7 +41,7 @@ Signed-off-by: Richard Weinberger <richard@nod.at>
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
@@ -543,8 +543,8 @@ static int init_constants_early(struct ubifs_info *c)
|
||||
@@ -543,8 +543,8 @@ static int init_constants_early(struct u
|
||||
if (c->max_write_size < c->min_io_size ||
|
||||
c->max_write_size % c->min_io_size ||
|
||||
!is_power_of_2(c->max_write_size)) {
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
From e86663c475d384ab5f46cb5637e9b7ad08c5c505 Mon Sep 17 00:00:00 2001
|
||||
From: Florian Fainelli <f.fainelli@gmail.com>
|
||||
Date: Fri, 15 Jul 2016 15:42:52 -0700
|
||||
Subject: [PATCH] net: bgmac: Fix infinite loop in bgmac_dma_tx_add()
|
||||
|
||||
Nothing is decrementing the index "i" while we are cleaning up the
|
||||
fragments we could not successful transmit.
|
||||
|
||||
Fixes: 9cde94506eacf ("bgmac: implement scatter/gather support")
|
||||
Reported-by: coverity (CID 1352048)
|
||||
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
|
||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
---
|
||||
drivers/net/ethernet/broadcom/bgmac.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/drivers/net/ethernet/broadcom/bgmac.c
|
||||
+++ b/drivers/net/ethernet/broadcom/bgmac.c
|
||||
@@ -207,7 +207,7 @@ err_dma:
|
||||
dma_unmap_single(dma_dev, slot->dma_addr, skb_headlen(skb),
|
||||
DMA_TO_DEVICE);
|
||||
|
||||
- while (i > 0) {
|
||||
+ while (i-- > 0) {
|
||||
int index = (ring->end + i) % BGMAC_TX_RING_SLOTS;
|
||||
struct bgmac_slot_info *slot = &ring->slots[index];
|
||||
u32 ctl1 = le32_to_cpu(ring->cpu_base[index].ctl1);
|
||||
@@ -1,41 +0,0 @@
|
||||
From 23cd0de28cc7978130b770dd59b18ac143253351 Mon Sep 17 00:00:00 2001
|
||||
From: Vineet Gupta <vgupta@synopsys.com>
|
||||
Date: Tue, 28 Jun 2016 09:42:25 +0530
|
||||
Subject: [PATCH] ARC: unwind: ensure that .debug_frame is generated (vs.
|
||||
.eh_frame)
|
||||
|
||||
With recent binutils update to support dwarf CFI pseudo-ops in gas, we
|
||||
now get .eh_frame vs. .debug_frame. Although the call frame info is
|
||||
exactly the same in both, the CIE differs, which the current kernel
|
||||
unwinder can't cope with.
|
||||
|
||||
This broke both the kernel unwinder as well as loadable modules (latter
|
||||
because of a new unhandled relo R_ARC_32_PCREL from .rela.eh_frame in
|
||||
the module loader)
|
||||
|
||||
The ideal solution would be to switch unwinder to .eh_frame.
|
||||
For now however we can make do by just ensureing .debug_frame is
|
||||
generated by removing -fasynchronous-unwind-tables
|
||||
|
||||
.eh_frame generated with -gdwarf-2 -fasynchronous-unwind-tables
|
||||
.debug_frame generated with -gdwarf-2
|
||||
|
||||
Fixes STAR 9001058196
|
||||
|
||||
Cc: stable@vger.kernel.org
|
||||
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
|
||||
---
|
||||
arch/arc/Makefile | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
--- a/arch/arc/Makefile
|
||||
+++ b/arch/arc/Makefile
|
||||
@@ -48,8 +48,6 @@ endif
|
||||
|
||||
endif
|
||||
|
||||
-cflags-$(CONFIG_ARC_DW2_UNWIND) += -fasynchronous-unwind-tables
|
||||
-
|
||||
# By default gcc 4.8 generates dwarf4 which kernel unwinder can't grok
|
||||
ifeq ($(atleast_gcc48),y)
|
||||
cflags-$(CONFIG_ARC_DW2_UNWIND) += -gdwarf-2
|
||||
@@ -31,8 +31,6 @@ Cc: Christian Ruppert <christian.ruppert@alitech.com>
|
||||
arch/arc/boot/dts/vdk_hs38_smp.dts | 1 +
|
||||
13 files changed, 13 insertions(+)
|
||||
|
||||
diff --git a/arch/arc/boot/dts/abilis_tb100_dvk.dts b/arch/arc/boot/dts/abilis_tb100_dvk.dts
|
||||
index 3dd6ed9..3acf04d 100644
|
||||
--- a/arch/arc/boot/dts/abilis_tb100_dvk.dts
|
||||
+++ b/arch/arc/boot/dts/abilis_tb100_dvk.dts
|
||||
@@ -24,6 +24,7 @@
|
||||
@@ -43,8 +41,6 @@ index 3dd6ed9..3acf04d 100644
|
||||
chosen {
|
||||
bootargs = "earlycon=uart8250,mmio32,0xff100000,9600n8 console=ttyS0,9600n8";
|
||||
};
|
||||
diff --git a/arch/arc/boot/dts/abilis_tb101_dvk.dts b/arch/arc/boot/dts/abilis_tb101_dvk.dts
|
||||
index 1cf51c2..37d88c5 100644
|
||||
--- a/arch/arc/boot/dts/abilis_tb101_dvk.dts
|
||||
+++ b/arch/arc/boot/dts/abilis_tb101_dvk.dts
|
||||
@@ -24,6 +24,7 @@
|
||||
@@ -55,8 +51,6 @@ index 1cf51c2..37d88c5 100644
|
||||
chosen {
|
||||
bootargs = "earlycon=uart8250,mmio32,0xff100000,9600n8 console=ttyS0,9600n8";
|
||||
};
|
||||
diff --git a/arch/arc/boot/dts/axs101.dts b/arch/arc/boot/dts/axs101.dts
|
||||
index 3f9b058..d9b9b9d 100644
|
||||
--- a/arch/arc/boot/dts/axs101.dts
|
||||
+++ b/arch/arc/boot/dts/axs101.dts
|
||||
@@ -13,6 +13,7 @@
|
||||
@@ -67,8 +61,6 @@ index 3f9b058..d9b9b9d 100644
|
||||
compatible = "snps,axs101", "snps,arc-sdp";
|
||||
|
||||
chosen {
|
||||
diff --git a/arch/arc/boot/dts/axs103.dts b/arch/arc/boot/dts/axs103.dts
|
||||
index e6d0e31..ec7fb27 100644
|
||||
--- a/arch/arc/boot/dts/axs103.dts
|
||||
+++ b/arch/arc/boot/dts/axs103.dts
|
||||
@@ -16,6 +16,7 @@
|
||||
@@ -79,8 +71,6 @@ index e6d0e31..ec7fb27 100644
|
||||
compatible = "snps,axs103", "snps,arc-sdp";
|
||||
|
||||
chosen {
|
||||
diff --git a/arch/arc/boot/dts/axs103_idu.dts b/arch/arc/boot/dts/axs103_idu.dts
|
||||
index f999fef..070c297 100644
|
||||
--- a/arch/arc/boot/dts/axs103_idu.dts
|
||||
+++ b/arch/arc/boot/dts/axs103_idu.dts
|
||||
@@ -16,6 +16,7 @@
|
||||
@@ -91,8 +81,6 @@ index f999fef..070c297 100644
|
||||
compatible = "snps,axs103", "snps,arc-sdp";
|
||||
|
||||
chosen {
|
||||
diff --git a/arch/arc/boot/dts/nsim_700.dts b/arch/arc/boot/dts/nsim_700.dts
|
||||
index 105a001..97a9a91 100644
|
||||
--- a/arch/arc/boot/dts/nsim_700.dts
|
||||
+++ b/arch/arc/boot/dts/nsim_700.dts
|
||||
@@ -10,6 +10,7 @@
|
||||
@@ -103,8 +91,6 @@ index 105a001..97a9a91 100644
|
||||
compatible = "snps,nsim";
|
||||
clock-frequency = <80000000>; /* 80 MHZ */
|
||||
#address-cells = <1>;
|
||||
diff --git a/arch/arc/boot/dts/nsim_hs.dts b/arch/arc/boot/dts/nsim_hs.dts
|
||||
index fc81879..1d47b14 100644
|
||||
--- a/arch/arc/boot/dts/nsim_hs.dts
|
||||
+++ b/arch/arc/boot/dts/nsim_hs.dts
|
||||
@@ -10,6 +10,7 @@
|
||||
@@ -115,8 +101,6 @@ index fc81879..1d47b14 100644
|
||||
compatible = "snps,nsim_hs";
|
||||
#address-cells = <2>;
|
||||
#size-cells = <2>;
|
||||
diff --git a/arch/arc/boot/dts/nsim_hs_idu.dts b/arch/arc/boot/dts/nsim_hs_idu.dts
|
||||
index 46ab319..b3a69a8 100644
|
||||
--- a/arch/arc/boot/dts/nsim_hs_idu.dts
|
||||
+++ b/arch/arc/boot/dts/nsim_hs_idu.dts
|
||||
@@ -10,6 +10,7 @@
|
||||
@@ -127,8 +111,6 @@ index 46ab319..b3a69a8 100644
|
||||
compatible = "snps,nsim_hs";
|
||||
interrupt-parent = <&core_intc>;
|
||||
|
||||
diff --git a/arch/arc/boot/dts/nsimosci.dts b/arch/arc/boot/dts/nsimosci.dts
|
||||
index 1c169dc..80f3c33 100644
|
||||
--- a/arch/arc/boot/dts/nsimosci.dts
|
||||
+++ b/arch/arc/boot/dts/nsimosci.dts
|
||||
@@ -10,6 +10,7 @@
|
||||
@@ -139,8 +121,6 @@ index 1c169dc..80f3c33 100644
|
||||
compatible = "snps,nsimosci";
|
||||
clock-frequency = <20000000>; /* 20 MHZ */
|
||||
#address-cells = <1>;
|
||||
diff --git a/arch/arc/boot/dts/nsimosci_hs.dts b/arch/arc/boot/dts/nsimosci_hs.dts
|
||||
index d64a96f..f680f1e 100644
|
||||
--- a/arch/arc/boot/dts/nsimosci_hs.dts
|
||||
+++ b/arch/arc/boot/dts/nsimosci_hs.dts
|
||||
@@ -10,6 +10,7 @@
|
||||
@@ -151,8 +131,6 @@ index d64a96f..f680f1e 100644
|
||||
compatible = "snps,nsimosci_hs";
|
||||
clock-frequency = <20000000>; /* 20 MHZ */
|
||||
#address-cells = <1>;
|
||||
diff --git a/arch/arc/boot/dts/nsimosci_hs_idu.dts b/arch/arc/boot/dts/nsimosci_hs_idu.dts
|
||||
index f6bf0ca..6e46b11 100644
|
||||
--- a/arch/arc/boot/dts/nsimosci_hs_idu.dts
|
||||
+++ b/arch/arc/boot/dts/nsimosci_hs_idu.dts
|
||||
@@ -10,6 +10,7 @@
|
||||
@@ -163,8 +141,6 @@ index f6bf0ca..6e46b11 100644
|
||||
compatible = "snps,nsimosci_hs";
|
||||
clock-frequency = <5000000>; /* 5 MHZ */
|
||||
#address-cells = <1>;
|
||||
diff --git a/arch/arc/boot/dts/vdk_hs38.dts b/arch/arc/boot/dts/vdk_hs38.dts
|
||||
index 5d803dd..3c51103 100644
|
||||
--- a/arch/arc/boot/dts/vdk_hs38.dts
|
||||
+++ b/arch/arc/boot/dts/vdk_hs38.dts
|
||||
@@ -13,6 +13,7 @@
|
||||
@@ -175,8 +151,6 @@ index 5d803dd..3c51103 100644
|
||||
compatible = "snps,axs103";
|
||||
|
||||
chosen {
|
||||
diff --git a/arch/arc/boot/dts/vdk_hs38_smp.dts b/arch/arc/boot/dts/vdk_hs38_smp.dts
|
||||
index 031a5bc..0054684 100644
|
||||
--- a/arch/arc/boot/dts/vdk_hs38_smp.dts
|
||||
+++ b/arch/arc/boot/dts/vdk_hs38_smp.dts
|
||||
@@ -13,6 +13,7 @@
|
||||
@@ -187,6 +161,3 @@ index 031a5bc..0054684 100644
|
||||
compatible = "snps,axs103";
|
||||
|
||||
chosen {
|
||||
--
|
||||
2.7.4
|
||||
|
||||
|
||||
@@ -1,76 +0,0 @@
|
||||
From 75ff39ccc1bd5d3c455b6822ab09e533c551f758 Mon Sep 17 00:00:00 2001
|
||||
From: Eric Dumazet <edumazet@google.com>
|
||||
Date: Sun, 10 Jul 2016 10:04:02 +0200
|
||||
Subject: [PATCH] tcp: make challenge acks less predictable
|
||||
|
||||
Yue Cao claims that current host rate limiting of challenge ACKS
|
||||
(RFC 5961) could leak enough information to allow a patient attacker
|
||||
to hijack TCP sessions. He will soon provide details in an academic
|
||||
paper.
|
||||
|
||||
This patch increases the default limit from 100 to 1000, and adds
|
||||
some randomization so that the attacker can no longer hijack
|
||||
sessions without spending a considerable amount of probes.
|
||||
|
||||
Based on initial analysis and patch from Linus.
|
||||
|
||||
Note that we also have per socket rate limiting, so it is tempting
|
||||
to remove the host limit in the future.
|
||||
|
||||
v2: randomize the count of challenge acks per second, not the period.
|
||||
|
||||
Fixes: 282f23c6ee34 ("tcp: implement RFC 5961 3.2")
|
||||
Reported-by: Yue Cao <ycao009@ucr.edu>
|
||||
Signed-off-by: Eric Dumazet <edumazet@google.com>
|
||||
Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
|
||||
Cc: Yuchung Cheng <ycheng@google.com>
|
||||
Cc: Neal Cardwell <ncardwell@google.com>
|
||||
Acked-by: Neal Cardwell <ncardwell@google.com>
|
||||
Acked-by: Yuchung Cheng <ycheng@google.com>
|
||||
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
---
|
||||
net/ipv4/tcp_input.c | 15 ++++++++++-----
|
||||
1 file changed, 10 insertions(+), 5 deletions(-)
|
||||
|
||||
--- a/net/ipv4/tcp_input.c
|
||||
+++ b/net/ipv4/tcp_input.c
|
||||
@@ -89,7 +89,7 @@ int sysctl_tcp_adv_win_scale __read_most
|
||||
EXPORT_SYMBOL(sysctl_tcp_adv_win_scale);
|
||||
|
||||
/* rfc5961 challenge ack rate limiting */
|
||||
-int sysctl_tcp_challenge_ack_limit = 100;
|
||||
+int sysctl_tcp_challenge_ack_limit = 1000;
|
||||
|
||||
int sysctl_tcp_stdurg __read_mostly;
|
||||
int sysctl_tcp_rfc1337 __read_mostly;
|
||||
@@ -3427,7 +3427,7 @@ static void tcp_send_challenge_ack(struc
|
||||
static u32 challenge_timestamp;
|
||||
static unsigned int challenge_count;
|
||||
struct tcp_sock *tp = tcp_sk(sk);
|
||||
- u32 now;
|
||||
+ u32 count, now;
|
||||
|
||||
/* First check our per-socket dupack rate limit. */
|
||||
if (tcp_oow_rate_limited(sock_net(sk), skb,
|
||||
@@ -3435,13 +3435,18 @@ static void tcp_send_challenge_ack(struc
|
||||
&tp->last_oow_ack_time))
|
||||
return;
|
||||
|
||||
- /* Then check the check host-wide RFC 5961 rate limit. */
|
||||
+ /* Then check host-wide RFC 5961 rate limit. */
|
||||
now = jiffies / HZ;
|
||||
if (now != challenge_timestamp) {
|
||||
+ u32 half = (sysctl_tcp_challenge_ack_limit + 1) >> 1;
|
||||
+
|
||||
challenge_timestamp = now;
|
||||
- challenge_count = 0;
|
||||
+ WRITE_ONCE(challenge_count, half +
|
||||
+ prandom_u32_max(sysctl_tcp_challenge_ack_limit));
|
||||
}
|
||||
- if (++challenge_count <= sysctl_tcp_challenge_ack_limit) {
|
||||
+ count = READ_ONCE(challenge_count);
|
||||
+ if (count > 0) {
|
||||
+ WRITE_ONCE(challenge_count, count - 1);
|
||||
NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_TCPCHALLENGEACK);
|
||||
tcp_send_ack(sk);
|
||||
}
|
||||
@@ -92,7 +92,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
||||
else if (ticks > maxt)
|
||||
--- a/include/linux/bcma/bcma.h
|
||||
+++ b/include/linux/bcma/bcma.h
|
||||
@@ -203,6 +203,9 @@ struct bcma_host_ops {
|
||||
@@ -204,6 +204,9 @@ struct bcma_host_ops {
|
||||
#define BCMA_PKG_ID_BCM4709 0
|
||||
#define BCMA_CHIP_ID_BCM47094 53030
|
||||
#define BCMA_CHIP_ID_BCM53018 53018
|
||||
|
||||
@@ -109,7 +109,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
config MODULES_TREE_LOOKUP
|
||||
--- a/kernel/module.c
|
||||
+++ b/kernel/module.c
|
||||
@@ -2859,6 +2859,7 @@ static struct module *setup_load_info(st
|
||||
@@ -2864,6 +2864,7 @@ static struct module *setup_load_info(st
|
||||
|
||||
static int check_modinfo(struct module *mod, struct load_info *info, int flags)
|
||||
{
|
||||
@@ -117,7 +117,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
const char *modmagic = get_modinfo(info, "vermagic");
|
||||
int err;
|
||||
|
||||
@@ -2884,6 +2885,7 @@ static int check_modinfo(struct module *
|
||||
@@ -2889,6 +2890,7 @@ static int check_modinfo(struct module *
|
||||
pr_warn("%s: module is from the staging directory, the quality "
|
||||
"is unknown, you have been warned.\n", mod->name);
|
||||
}
|
||||
|
||||
@@ -324,7 +324,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||||
VMLINUX_SYMBOL(__ctors_end) = .;
|
||||
#else
|
||||
#define KERNEL_CTORS()
|
||||
@@ -552,7 +553,7 @@
|
||||
@@ -556,7 +557,7 @@
|
||||
#define SBSS(sbss_align) \
|
||||
. = ALIGN(sbss_align); \
|
||||
.sbss : AT(ADDR(.sbss) - LOAD_OFFSET) { \
|
||||
@@ -333,7 +333,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||||
*(.scommon) \
|
||||
}
|
||||
|
||||
@@ -570,7 +571,7 @@
|
||||
@@ -574,7 +575,7 @@
|
||||
BSS_FIRST_SECTIONS \
|
||||
*(.bss..page_aligned) \
|
||||
*(.dynbss) \
|
||||
@@ -342,7 +342,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||||
*(COMMON) \
|
||||
}
|
||||
|
||||
@@ -619,7 +620,7 @@
|
||||
@@ -623,7 +624,7 @@
|
||||
. = ALIGN(8); \
|
||||
__bug_table : AT(ADDR(__bug_table) - LOAD_OFFSET) { \
|
||||
VMLINUX_SYMBOL(__start___bug_table) = .; \
|
||||
@@ -351,7 +351,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||||
VMLINUX_SYMBOL(__stop___bug_table) = .; \
|
||||
}
|
||||
#else
|
||||
@@ -631,7 +632,7 @@
|
||||
@@ -635,7 +636,7 @@
|
||||
. = ALIGN(4); \
|
||||
.tracedata : AT(ADDR(.tracedata) - LOAD_OFFSET) { \
|
||||
VMLINUX_SYMBOL(__tracedata_start) = .; \
|
||||
@@ -360,7 +360,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||||
VMLINUX_SYMBOL(__tracedata_end) = .; \
|
||||
}
|
||||
#else
|
||||
@@ -648,17 +649,17 @@
|
||||
@@ -652,17 +653,17 @@
|
||||
#define INIT_SETUP(initsetup_align) \
|
||||
. = ALIGN(initsetup_align); \
|
||||
VMLINUX_SYMBOL(__setup_start) = .; \
|
||||
@@ -382,7 +382,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||||
INIT_CALLS_LEVEL(0) \
|
||||
INIT_CALLS_LEVEL(1) \
|
||||
INIT_CALLS_LEVEL(2) \
|
||||
@@ -672,21 +673,21 @@
|
||||
@@ -676,21 +677,21 @@
|
||||
|
||||
#define CON_INITCALL \
|
||||
VMLINUX_SYMBOL(__con_initcall_start) = .; \
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
} \
|
||||
\
|
||||
/* __*init sections */ \
|
||||
@@ -706,6 +716,8 @@
|
||||
@@ -710,6 +720,8 @@
|
||||
EXIT_TEXT \
|
||||
EXIT_DATA \
|
||||
EXIT_CALL \
|
||||
|
||||
@@ -40,7 +40,7 @@ Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
|
||||
;----------------------------------------------------------------
|
||||
--- a/arch/arc/kernel/setup.c
|
||||
+++ b/arch/arc/kernel/setup.c
|
||||
@@ -370,6 +370,8 @@ static inline int is_kernel(unsigned lon
|
||||
@@ -366,6 +366,8 @@ static inline int is_kernel(unsigned lon
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -49,7 +49,7 @@ Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
|
||||
void __init setup_arch(char **cmdline_p)
|
||||
{
|
||||
#ifdef CONFIG_ARC_UBOOT_SUPPORT
|
||||
@@ -383,7 +385,7 @@ void __init setup_arch(char **cmdline_p)
|
||||
@@ -379,7 +381,7 @@ void __init setup_arch(char **cmdline_p)
|
||||
#endif
|
||||
{
|
||||
/* No, so try the embedded one */
|
||||
|
||||
@@ -11,7 +11,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
|
||||
--- a/drivers/mtd/ubi/build.c
|
||||
+++ b/drivers/mtd/ubi/build.c
|
||||
@@ -1200,6 +1200,49 @@ static struct mtd_info * __init open_mtd
|
||||
@@ -1203,6 +1203,49 @@ static struct mtd_info * __init open_mtd
|
||||
return mtd;
|
||||
}
|
||||
|
||||
@@ -61,7 +61,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
static int __init ubi_init(void)
|
||||
{
|
||||
int err, i, k;
|
||||
@@ -1283,6 +1326,12 @@ static int __init ubi_init(void)
|
||||
@@ -1286,6 +1329,12 @@ static int __init ubi_init(void)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/include/linux/skbuff.h
|
||||
+++ b/include/linux/skbuff.h
|
||||
@@ -2179,7 +2179,7 @@ static inline int pskb_network_may_pull(
|
||||
@@ -2180,7 +2180,7 @@ static inline int pskb_network_may_pull(
|
||||
* NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
|
||||
*/
|
||||
#ifndef NET_SKB_PAD
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
*/
|
||||
--- a/include/linux/skbuff.h
|
||||
+++ b/include/linux/skbuff.h
|
||||
@@ -2210,6 +2210,10 @@ static inline int pskb_trim(struct sk_bu
|
||||
@@ -2211,6 +2211,10 @@ static inline int pskb_trim(struct sk_bu
|
||||
return (len < skb->len) ? __pskb_trim(skb, len) : 0;
|
||||
}
|
||||
|
||||
@@ -52,7 +52,7 @@
|
||||
/**
|
||||
* pskb_trim_unique - remove end from a paged unique (not cloned) buffer
|
||||
* @skb: buffer to alter
|
||||
@@ -2314,16 +2318,6 @@ static inline struct sk_buff *dev_alloc_
|
||||
@@ -2315,16 +2319,6 @@ static inline struct sk_buff *dev_alloc_
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -69,7 +69,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
/**
|
||||
* ata_build_rw_tf - Build ATA taskfile for given read/write request
|
||||
* @tf: Target ATA taskfile
|
||||
@@ -4774,6 +4787,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
|
||||
@@ -4780,6 +4793,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
|
||||
if (tag < 0)
|
||||
return NULL;
|
||||
}
|
||||
@@ -79,7 +79,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
|
||||
qc = __ata_qc_from_tag(ap, tag);
|
||||
qc->tag = tag;
|
||||
@@ -5671,6 +5687,9 @@ struct ata_port *ata_port_alloc(struct a
|
||||
@@ -5677,6 +5693,9 @@ struct ata_port *ata_port_alloc(struct a
|
||||
ap->stats.unhandled_irq = 1;
|
||||
ap->stats.idle_irq = 1;
|
||||
#endif
|
||||
@@ -89,7 +89,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
ata_sff_port_init(ap);
|
||||
|
||||
return ap;
|
||||
@@ -5692,6 +5711,12 @@ static void ata_host_release(struct devi
|
||||
@@ -5698,6 +5717,12 @@ static void ata_host_release(struct devi
|
||||
|
||||
kfree(ap->pmp_link);
|
||||
kfree(ap->slave_link);
|
||||
@@ -102,7 +102,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
kfree(ap);
|
||||
host->ports[i] = NULL;
|
||||
}
|
||||
@@ -6138,7 +6163,23 @@ int ata_host_register(struct ata_host *h
|
||||
@@ -6144,7 +6169,23 @@ int ata_host_register(struct ata_host *h
|
||||
host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
|
||||
host->ports[i]->local_port_no = i + 1;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user