diff options
author | Jody McIntyre <scjody@modernduck.com> | 2005-12-16 17:10:35 -0500 |
---|---|---|
committer | Jody McIntyre <scjody@modernduck.com> | 2005-12-16 17:10:35 -0500 |
commit | 16e842a62a8ffcc2e51def6ef9fd6e0926539bc5 (patch) | |
tree | 2cf6c23ab195e68712bca51351c1d37ed950c55d /mm/page_alloc.c | |
parent | 525352eb6d355bef6adf597252fc6d04f2dbe66c (diff) | |
parent | 42245e65f356ed54fdf7a1f9a0095e0bc40f73a3 (diff) |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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 3b21a13d841c..fe14a8c87fc2 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1896,7 +1896,7 @@ static int __devinit pageset_cpuup_callback(struct notifier_block *nfb, static struct notifier_block pageset_notifier = { &pageset_cpuup_callback, NULL, 0 }; -void __init setup_per_cpu_pageset() +void __init setup_per_cpu_pageset(void) { int err; |