projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "perf vendor events intel: Add metrics for Icelake Server"
[linux-2.6-microblaze.git]
/
mm
/
compaction.c
diff --git
a/mm/compaction.c
b/mm/compaction.c
index
1be7928
..
84fde27
100644
(file)
--- a/
mm/compaction.c
+++ b/
mm/compaction.c
@@
-2012,8
+2012,8
@@
static unsigned int fragmentation_score_wmark(pg_data_t *pgdat, bool low)
unsigned int wmark_low;
/*
unsigned int wmark_low;
/*
- * Cap the low watermak to avoid excessive compaction
- * activity in case a user sets the proactivess tunable
+ * Cap the low waterma
r
k to avoid excessive compaction
+ * activity in case a user sets the proactive
ne
ss tunable
* close to 100 (maximum).
*/
wmark_low = max(100U - sysctl_compaction_proactiveness, 5U);
* close to 100 (maximum).
*/
wmark_low = max(100U - sysctl_compaction_proactiveness, 5U);
@@
-2354,7
+2354,8
@@
compact_zone(struct compact_control *cc, struct capture_control *capc)
trace_mm_compaction_begin(start_pfn, cc->migrate_pfn,
cc->free_pfn, end_pfn, sync);
trace_mm_compaction_begin(start_pfn, cc->migrate_pfn,
cc->free_pfn, end_pfn, sync);
- migrate_prep_local();
+ /* lru_add_drain_all could be expensive with involving other CPUs */
+ lru_add_drain();
while ((ret = compact_finished(cc)) == COMPACT_CONTINUE) {
int err;
while ((ret = compact_finished(cc)) == COMPACT_CONTINUE) {
int err;
@@
-2884,7
+2885,7
@@
void wakeup_kcompactd(pg_data_t *pgdat, int order, int highest_zoneidx)
*/
static int kcompactd(void *p)
{
*/
static int kcompactd(void *p)
{
- pg_data_t *pgdat = (pg_data_t*)p;
+ pg_data_t *pgdat = (pg_data_t
*)p;
struct task_struct *tsk = current;
unsigned int proactive_defer = 0;
struct task_struct *tsk = current;
unsigned int proactive_defer = 0;