mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-31 04:01:48 -04:00
[PATCH] consolidate lru_add_drain() and lru_drain_cache()
Cc: Christoph Lameter <[email protected]> Cc: Rajesh Shah <[email protected]> Cc: Li Shaohua <[email protected]> Cc: Srivatsa Vaddagiri <[email protected]> Cc: Ashok Raj <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
210fe53030
commit
80bfed904c
1 changed files with 11 additions and 16 deletions
27
mm/swap.c
27
mm/swap.c
|
|
@ -156,16 +156,22 @@ void fastcall lru_cache_add_active(struct page *page)
|
|||
put_cpu_var(lru_add_active_pvecs);
|
||||
}
|
||||
|
||||
void lru_add_drain(void)
|
||||
static void __lru_add_drain(int cpu)
|
||||
{
|
||||
struct pagevec *pvec = &get_cpu_var(lru_add_pvecs);
|
||||
struct pagevec *pvec = &per_cpu(lru_add_pvecs, cpu);
|
||||
|
||||
/* CPU is dead, so no locking needed. */
|
||||
if (pagevec_count(pvec))
|
||||
__pagevec_lru_add(pvec);
|
||||
pvec = &__get_cpu_var(lru_add_active_pvecs);
|
||||
pvec = &per_cpu(lru_add_active_pvecs, cpu);
|
||||
if (pagevec_count(pvec))
|
||||
__pagevec_lru_add_active(pvec);
|
||||
put_cpu_var(lru_add_pvecs);
|
||||
}
|
||||
|
||||
void lru_add_drain(void)
|
||||
{
|
||||
__lru_add_drain(get_cpu());
|
||||
put_cpu();
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -412,17 +418,6 @@ void vm_acct_memory(long pages)
|
|||
}
|
||||
|
||||
#ifdef CONFIG_HOTPLUG_CPU
|
||||
static void lru_drain_cache(unsigned int cpu)
|
||||
{
|
||||
struct pagevec *pvec = &per_cpu(lru_add_pvecs, cpu);
|
||||
|
||||
/* CPU is dead, so no locking needed. */
|
||||
if (pagevec_count(pvec))
|
||||
__pagevec_lru_add(pvec);
|
||||
pvec = &per_cpu(lru_add_active_pvecs, cpu);
|
||||
if (pagevec_count(pvec))
|
||||
__pagevec_lru_add_active(pvec);
|
||||
}
|
||||
|
||||
/* Drop the CPU's cached committed space back into the central pool. */
|
||||
static int cpu_swap_callback(struct notifier_block *nfb,
|
||||
|
|
@ -435,7 +430,7 @@ static int cpu_swap_callback(struct notifier_block *nfb,
|
|||
if (action == CPU_DEAD) {
|
||||
atomic_add(*committed, &vm_committed_space);
|
||||
*committed = 0;
|
||||
lru_drain_cache((long)hcpu);
|
||||
__lru_add_drain((long)hcpu);
|
||||
}
|
||||
return NOTIFY_OK;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue