diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-12-31 10:27:22 -0800 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-12-31 10:27:22 -0800 |
| commit | eea60caef610c7a6c58c0de9c80ae1e438e01301 (patch) | |
| tree | 25e19289bba003fe085e589430d0d981fd6b73a7 /mm/page_alloc.c | |
| parent | da8543ef125afc7bba4da526b61a1ae07dc25109 (diff) | |
| parent | 82c9df820112c6286a8e8fbe482e94b65b49062c (diff) | |
| download | kernel-crypto-eea60caef610c7a6c58c0de9c80ae1e438e01301.tar.gz kernel-crypto-eea60caef610c7a6c58c0de9c80ae1e438e01301.tar.xz kernel-crypto-eea60caef610c7a6c58c0de9c80ae1e438e01301.zip | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
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 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; |