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
Merge branch 'x86-acpi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
mm
/
vmscan.c
diff --git
a/mm/vmscan.c
b/mm/vmscan.c
index
5394731
..
7f30961
100644
(file)
--- a/
mm/vmscan.c
+++ b/
mm/vmscan.c
@@
-2963,7
+2963,7
@@
static int kswapd(void *p)
classzone_idx = new_classzone_idx = pgdat->nr_zones - 1;
balanced_classzone_idx = classzone_idx;
for ( ; ; ) {
classzone_idx = new_classzone_idx = pgdat->nr_zones - 1;
balanced_classzone_idx = classzone_idx;
for ( ; ; ) {
-
int
ret;
+
bool
ret;
/*
* If the last balance_pgdat was unsuccessful it's unlikely a
/*
* If the last balance_pgdat was unsuccessful it's unlikely a
@@
-3131,7
+3131,7
@@
static int __devinit cpu_callback(struct notifier_block *nfb,
int nid;
if (action == CPU_ONLINE || action == CPU_ONLINE_FROZEN) {
int nid;
if (action == CPU_ONLINE || action == CPU_ONLINE_FROZEN) {
- for_each_node_state(nid, N_
HIGH_
MEMORY) {
+ for_each_node_state(nid, N_MEMORY) {
pg_data_t *pgdat = NODE_DATA(nid);
const struct cpumask *mask;
pg_data_t *pgdat = NODE_DATA(nid);
const struct cpumask *mask;
@@
-3187,7
+3187,7
@@
static int __init kswapd_init(void)
int nid;
swap_setup();
int nid;
swap_setup();
- for_each_node_state(nid, N_
HIGH_
MEMORY)
+ for_each_node_state(nid, N_MEMORY)
kswapd_run(nid);
hotcpu_notifier(cpu_callback, 0);
return 0;
kswapd_run(nid);
hotcpu_notifier(cpu_callback, 0);
return 0;