diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-11 10:30:23 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-11 10:30:23 +0100 |
| commit | 65a37b29a8d7492f081d4f8da2227467af1c0c1d (patch) | |
| tree | 7d1121df648e8e692767034dbf979342623a6aed /include | |
| parent | 1d8ce7bc4d05b4a5c04dc17f92fef26989fb5935 (diff) | |
| parent | 60db56422043aaa455ac7f858ce23c273220f9d9 (diff) | |
| download | blackbird-op-linux-65a37b29a8d7492f081d4f8da2227467af1c0c1d.tar.gz blackbird-op-linux-65a37b29a8d7492f081d4f8da2227467af1c0c1d.zip | |
Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/percpu
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 54a968b4b924..ee5615d65211 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 |
