projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
x86/mce: Fix check for processor context when machine check was taken.
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
mm
/
swap.c
diff --git
a/mm/swap.c
b/mm/swap.c
index
fff1ff7
..
5c13f13
100644
(file)
--- a/
mm/swap.c
+++ b/
mm/swap.c
@@
-496,7
+496,7
@@
static void lru_deactivate_fn(struct page *page, void *arg)
* Either "cpu" is the current CPU, and preemption has already been
* disabled; or "cpu" is being hot-unplugged, and is already dead.
*/
* Either "cpu" is the current CPU, and preemption has already been
* disabled; or "cpu" is being hot-unplugged, and is already dead.
*/
-
static void drain_cpu_pagevecs
(int cpu)
+
void lru_add_drain_cpu
(int cpu)
{
struct pagevec *pvecs = per_cpu(lru_add_pvecs, cpu);
struct pagevec *pvec;
{
struct pagevec *pvecs = per_cpu(lru_add_pvecs, cpu);
struct pagevec *pvec;
@@
-553,7
+553,7
@@
void deactivate_page(struct page *page)
void lru_add_drain(void)
{
void lru_add_drain(void)
{
-
drain_cpu_pagevecs
(get_cpu());
+
lru_add_drain_cpu
(get_cpu());
put_cpu();
}
put_cpu();
}
@@
-652,7
+652,7
@@
EXPORT_SYMBOL(__pagevec_release);
void lru_add_page_tail(struct zone* zone,
struct page *page, struct page *page_tail)
{
void lru_add_page_tail(struct zone* zone,
struct page *page, struct page *page_tail)
{
- int
active
;
+ int
uninitialized_var(active)
;
enum lru_list lru;
const int file = 0;
enum lru_list lru;
const int file = 0;
@@
-672,7
+672,6
@@
void lru_add_page_tail(struct zone* zone,
active = 0;
lru = LRU_INACTIVE_ANON;
}
active = 0;
lru = LRU_INACTIVE_ANON;
}
- update_page_reclaim_stat(zone, page_tail, file, active);
} else {
SetPageUnevictable(page_tail);
lru = LRU_UNEVICTABLE;
} else {
SetPageUnevictable(page_tail);
lru = LRU_UNEVICTABLE;
@@
-693,6
+692,9
@@
void lru_add_page_tail(struct zone* zone,
list_head = page_tail->lru.prev;
list_move_tail(&page_tail->lru, list_head);
}
list_head = page_tail->lru.prev;
list_move_tail(&page_tail->lru, list_head);
}
+
+ if (!PageUnevictable(page))
+ update_page_reclaim_stat(zone, page_tail, file, active);
}
#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
}
#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
@@
-710,8
+712,8
@@
static void __pagevec_lru_add_fn(struct page *page, void *arg)
SetPageLRU(page);
if (active)
SetPageActive(page);
SetPageLRU(page);
if (active)
SetPageActive(page);
- update_page_reclaim_stat(zone, page, file, active);
add_page_to_lru_list(zone, page, lru);
add_page_to_lru_list(zone, page, lru);
+ update_page_reclaim_stat(zone, page, file, active);
}
/*
}
/*