diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:52:44 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:52:44 -0400 |
| commit | 1a2e8a6f8ec0a068911a882a19e0912a0c89be6e (patch) | |
| tree | e0e70aa880b8c8f2c1a979438a523241f6193742 /mm/page_alloc.c | |
| parent | 9f1da23b631f92393f58f664348ffc5faeaddeb3 (diff) | |
| parent | 2be4d50295e2b6f62c07b614e1b103e280dddb84 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'mm/page_alloc.c')
| -rw-r--r-- | mm/page_alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 123c60586740..ea77c999047e 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
| @@ -1962,7 +1962,7 @@ static inline void free_zone_pagesets(int cpu) | |||
| 1962 | } | 1962 | } |
| 1963 | } | 1963 | } |
| 1964 | 1964 | ||
| 1965 | static int __cpuinit pageset_cpuup_callback(struct notifier_block *nfb, | 1965 | static int pageset_cpuup_callback(struct notifier_block *nfb, |
| 1966 | unsigned long action, | 1966 | unsigned long action, |
| 1967 | void *hcpu) | 1967 | void *hcpu) |
| 1968 | { | 1968 | { |