diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-14 09:50:10 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-14 09:50:10 +0100 |
| commit | c550033ced484d8d333bc1edc0a482728680e689 (patch) | |
| tree | f5e10a2879a2a446be8d4aefb385cd6845c19c72 /include | |
| parent | a98fe7f3425c6b4e90de16f8da63b0429a8fed08 (diff) | |
| parent | 7a46c594bf7f1f2eeb1e12d4b857d5f581957a92 (diff) | |
Merge branch 'core/percpu' into x86/core
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/percpu.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/percpu.h b/include/linux/percpu.h index 54a968b4b92..ee5615d6521 100644 --- a/include/linux/percpu.h +++ b/include/linux/percpu.h @@ -107,10 +107,14 @@ typedef void (*pcpu_populate_pte_fn_t)(unsigned long addr); extern size_t __init pcpu_setup_first_chunk(pcpu_get_page_fn_t get_page_fn, size_t static_size, size_t reserved_size, - ssize_t unit_size, ssize_t dyn_size, + ssize_t dyn_size, ssize_t unit_size, void *base_addr, pcpu_populate_pte_fn_t populate_pte_fn); +extern ssize_t __init pcpu_embed_first_chunk( + size_t static_size, size_t reserved_size, + ssize_t dyn_size, ssize_t unit_size); + /* * Use this to get to a cpu's version of the per-cpu object * dynamically allocated. Non-atomic access to the current CPU's |