diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-07-31 10:27:19 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-07-31 10:28:53 +0200 |
| commit | 555ee95a0a5a525ad2f1654fab0bd157de832b4f (patch) | |
| tree | 5ff341bedaa848027d5eba1e2a9fbfaeb9501250 /drivers | |
| parent | Merge tag 'xfs-for-linus-4.2-rc4' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | nohz: Remove useless argument on tick_nohz_task_switch() (diff) | |
| download | linux-555ee95a0a5a525ad2f1654fab0bd157de832b4f.tar.xz linux-555ee95a0a5a525ad2f1654fab0bd157de832b4f.zip | |
Merge branch 'timers/nohz-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks into timers/nohz
Pull NOHZ updates from Frederic Weisbecker:
- Fix some jiffies based cputime assumptions. No real harm because the
concerned code isn't used by full dynticks.
- Simplify jiffies <-> usecs conversions. Remove dead code.
- Remove early hacks on nohz full code that avoided messing up idle
nohz internals. Now nohz integrates well full and idle and such hack
have become needless.
- Restart nohz full tick from irq exit. A simplification and a
preparation for future optimization on scheduler kick to nohz full.
- Simple code cleanups.
- Tile driver isolation enhancement on top of nohz.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/tile/tilegx.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/tile/tilegx.c b/drivers/net/ethernet/tile/tilegx.c index a3f7610002aa..0a15acc075b3 100644 --- a/drivers/net/ethernet/tile/tilegx.c +++ b/drivers/net/ethernet/tile/tilegx.c @@ -40,6 +40,7 @@ #include <linux/tcp.h> #include <linux/net_tstamp.h> #include <linux/ptp_clock_kernel.h> +#include <linux/tick.h> #include <asm/checksum.h> #include <asm/homecache.h> @@ -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; } |