projects
/
platform
/
kernel
/
linux-starfive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mm: memcg: per-priority per-zone hierarchy scan generations
[platform/kernel/linux-starfive.git]
/
mm
/
compaction.c
diff --git
a/mm/compaction.c
b/mm/compaction.c
index
899d956
..
e6670c3
100644
(file)
--- a/
mm/compaction.c
+++ b/
mm/compaction.c
@@
-365,8
+365,10
@@
static isolate_migrate_t isolate_migratepages(struct zone *zone,
nr_isolated++;
/* Avoid isolating too much */
nr_isolated++;
/* Avoid isolating too much */
- if (cc->nr_migratepages == COMPACT_CLUSTER_MAX)
+ if (cc->nr_migratepages == COMPACT_CLUSTER_MAX) {
+ ++low_pfn;
break;
break;
+ }
}
acct_isolated(zone, cc);
}
acct_isolated(zone, cc);
@@
-721,23
+723,23
@@
int sysctl_extfrag_handler(struct ctl_table *table, int write,
}
#if defined(CONFIG_SYSFS) && defined(CONFIG_NUMA)
}
#if defined(CONFIG_SYSFS) && defined(CONFIG_NUMA)
-ssize_t sysfs_compact_node(struct
sys_
device *dev,
- struct
sysdev
_attribute *attr,
+ssize_t sysfs_compact_node(struct device *dev,
+ struct
device
_attribute *attr,
const char *buf, size_t count)
{
compact_node(dev->id);
return count;
}
const char *buf, size_t count)
{
compact_node(dev->id);
return count;
}
-static
SYSDEV
_ATTR(compact, S_IWUSR, NULL, sysfs_compact_node);
+static
DEVICE
_ATTR(compact, S_IWUSR, NULL, sysfs_compact_node);
int compaction_register_node(struct node *node)
{
int compaction_register_node(struct node *node)
{
- return
sysdev_create_file(&node->sysdev, &
attr_compact);
+ return
device_create_file(&node->dev, &dev_
attr_compact);
}
void compaction_unregister_node(struct node *node)
{
}
void compaction_unregister_node(struct node *node)
{
- return
sysdev_remove_file(&node->sysdev, &
attr_compact);
+ return
device_remove_file(&node->dev, &dev_
attr_compact);
}
#endif /* CONFIG_SYSFS && CONFIG_NUMA */
}
#endif /* CONFIG_SYSFS && CONFIG_NUMA */