From e09b41010ba33a20a87472ee821fa407a5b8da36 Mon Sep 17 00:00:00 2001 From: José Pekkarinen Date: Mon, 11 Apr 2016 10:41:07 +0300 Subject: These changes are the raw update to linux-4.4.6-rt14. Kernel sources are taken from kernel.org, and rt patch from the rt wiki download page. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit During the rebasing, the following patch collided: Force tick interrupt and get rid of softirq magic(I70131fb85). Collisions have been removed because its logic was found on the source already. Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769 Signed-off-by: José Pekkarinen --- kernel/drivers/net/ethernet/tile/tilegx.c | 4 +++- kernel/drivers/net/ethernet/tile/tilepro.c | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'kernel/drivers/net/ethernet/tile') diff --git a/kernel/drivers/net/ethernet/tile/tilegx.c b/kernel/drivers/net/ethernet/tile/tilegx.c index a3f761000..0a15acc07 100644 --- a/kernel/drivers/net/ethernet/tile/tilegx.c +++ b/kernel/drivers/net/ethernet/tile/tilegx.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include @@ -2273,7 +2274,8 @@ static int __init tile_net_init_module(void) tile_net_dev_init(name, mac); if (!network_cpus_init()) - network_cpus_map = *cpu_online_mask; + cpumask_and(&network_cpus_map, housekeeping_cpumask(), + cpu_online_mask); return 0; } diff --git a/kernel/drivers/net/ethernet/tile/tilepro.c b/kernel/drivers/net/ethernet/tile/tilepro.c index 3d8f60d96..6f0a4495c 100644 --- a/kernel/drivers/net/ethernet/tile/tilepro.c +++ b/kernel/drivers/net/ethernet/tile/tilepro.c @@ -721,9 +721,6 @@ static bool tile_net_poll_aux(struct tile_net_cpu *info, int index) if (!hash_default) __inv_buffer(buf, len); - /* ISSUE: Is this needed? */ - dev->last_rx = jiffies; - #ifdef TILE_NET_DUMP_PACKETS dump_packet(buf, len, "rx"); #endif /* TILE_NET_DUMP_PACKETS */ -- cgit 1.2.3-korg