aboutsummaryrefslogtreecommitdiff
path: root/mm/page_alloc.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-12-19 00:09:53 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-12-19 00:09:53 -0500
commit418fbfe979d96efc7b91f29b2085d51541c61f0b (patch)
treea9acb07328e0c76011727d5b3b6f5407afcd2866 /mm/page_alloc.c
parent8b132f4ee7304fec4fa27dec67879bc0172e916a (diff)
parentff60dde9e46b87757d5e83bd58be0688fca8e816 (diff)
Merge branch 'master'
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r--mm/page_alloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 3b21a13d841..fe14a8c87fc 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;