diff options
| author | David S. Miller <davem@davemloft.net> | 2019-02-24 22:48:04 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-02-24 23:06:19 +0300 |
| commit | 70f3522614e60b6125eff5f9dd7c887543812187 (patch) | |
| tree | 5e08ed970fb035feb4a99ac8526c74da0d445d01 /mm/swap.c | |
| parent | a75d1d01477d5235aac613c167b0653441281ad7 (diff) | |
| parent | c3619a482e15d98e1d2eb6b32952e753077e7545 (diff) | |
| download | linux-70f3522614e60b6125eff5f9dd7c887543812187.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Three conflicts, one of which, for marvell10g.c is non-trivial and
requires some follow-up from Heiner or someone else.
The issue is that Heiner converted the marvell10g driver over to
use the generic c45 code as much as possible.
However, in 'net' a bug fix appeared which makes sure that a new
local mask (MDIO_AN_10GBT_CTRL_ADV_NBT_MASK) with value 0x01e0
is cleared.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'mm/swap.c')
| -rw-r--r-- | mm/swap.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/mm/swap.c b/mm/swap.c index 4929bc1be60e..4d7d37eb3c40 100644 --- a/mm/swap.c +++ b/mm/swap.c @@ -320,11 +320,6 @@ static inline void activate_page_drain(int cpu) { } -static bool need_activate_page_drain(int cpu) -{ - return false; -} - void activate_page(struct page *page) { struct zone *zone = page_zone(page); @@ -653,13 +648,15 @@ void lru_add_drain(void) put_cpu(); } +#ifdef CONFIG_SMP + +static DEFINE_PER_CPU(struct work_struct, lru_add_drain_work); + static void lru_add_drain_per_cpu(struct work_struct *dummy) { lru_add_drain(); } -static DEFINE_PER_CPU(struct work_struct, lru_add_drain_work); - /* * Doesn't need any cpu hotplug locking because we do rely on per-cpu * kworkers being shut down before our page_alloc_cpu_dead callback is @@ -702,6 +699,12 @@ void lru_add_drain_all(void) mutex_unlock(&lock); } +#else +void lru_add_drain_all(void) +{ + lru_add_drain(); +} +#endif /** * release_pages - batched put_page() |