Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 42685
b: refs/heads/master
c: ce421c7
h: refs/heads/master
i:
  42683: 11c3a20
v: v3
  • Loading branch information
Andy Whitcroft authored and Linus Torvalds committed Dec 7, 2006
1 parent 7d13b24 commit 43b20b5
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5d1854e15ee979f8e27330f0d3ce5e2703afa1dc
refs/heads/master: ce421c799b5bde77aa60776d6fb61036ae0aea11
20 changes: 10 additions & 10 deletions trunk/mm/page_alloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -2042,16 +2042,16 @@ static int __cpuinit pageset_cpuup_callback(struct notifier_block *nfb,
int ret = NOTIFY_OK;

switch (action) {
case CPU_UP_PREPARE:
if (process_zones(cpu))
ret = NOTIFY_BAD;
break;
case CPU_UP_CANCELED:
case CPU_DEAD:
free_zone_pagesets(cpu);
break;
default:
break;
case CPU_UP_PREPARE:
if (process_zones(cpu))
ret = NOTIFY_BAD;
break;
case CPU_UP_CANCELED:
case CPU_DEAD:
free_zone_pagesets(cpu);
break;
default:
break;
}
return ret;
}
Expand Down
14 changes: 7 additions & 7 deletions trunk/mm/vmstat.c
Original file line number Diff line number Diff line change
Expand Up @@ -679,13 +679,13 @@ static int __cpuinit vmstat_cpuup_callback(struct notifier_block *nfb,
void *hcpu)
{
switch (action) {
case CPU_UP_PREPARE:
case CPU_UP_CANCELED:
case CPU_DEAD:
refresh_zone_stat_thresholds();
break;
default:
break;
case CPU_UP_PREPARE:
case CPU_UP_CANCELED:
case CPU_DEAD:
refresh_zone_stat_thresholds();
break;
default:
break;
}
return NOTIFY_OK;
}
Expand Down

0 comments on commit 43b20b5

Please sign in to comment.