diff options
author | Mark Brown <broonie@linaro.org> | 2013-11-24 18:35:18 +0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-11-24 18:35:18 +0400 |
commit | 30c27abd28fa168d7ebd2e5286f1fe473c74bfa9 (patch) | |
tree | 9936b38c0c81cd430d5e75906c1207d127fe588c /drivers/net/ethernet/tile/tilepro.c | |
parent | 16ec790938d4f356c82fab27b9a9adf4d6fe19a6 (diff) | |
parent | 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae (diff) | |
download | linux-30c27abd28fa168d7ebd2e5286f1fe473c74bfa9.tar.xz |
Merge tag 'v3.13-rc1' into asoc-arizona
Linux 3.13-rc1
Diffstat (limited to 'drivers/net/ethernet/tile/tilepro.c')
-rw-r--r-- | drivers/net/ethernet/tile/tilepro.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/tile/tilepro.c b/drivers/net/ethernet/tile/tilepro.c index 106be47716e7..edb2e12a0fe2 100644 --- a/drivers/net/ethernet/tile/tilepro.c +++ b/drivers/net/ethernet/tile/tilepro.c @@ -1008,6 +1008,8 @@ static void tile_net_register(void *dev_ptr) info->egress_timer.data = (long)info; info->egress_timer.function = tile_net_handle_egress_timer; + u64_stats_init(&info->stats.syncp); + priv->cpu[my_cpu] = info; /* |