mfd: Add all twl4030 regulators to the twl4030 mfd driver

[safe/jmp/linux-2.6] / include / linux / percpu.h

diff --git a/include/linux/percpu.h b/include/linux/percpu.h
index ec64357..878836c 100644 (file)
--- a/include/linux/percpu.h
+++ b/include/linux/percpu.h
@@ -57,52 +57,69 @@
 #endif
 
 extern void *pcpu_base_addr;
+extern const unsigned long *pcpu_unit_offsets;
 
-typedef struct page * (*pcpu_get_page_fn_t)(unsigned int cpu, int pageno);
-typedef void * (*pcpu_fc_alloc_fn_t)(unsigned int cpu, size_t size);
+struct pcpu_group_info {
+       int                     nr_units;       /* aligned # of units */
+       unsigned long           base_offset;    /* base address offset */
+       unsigned int            *cpu_map;       /* unit->cpu map, empty
+                                                * entries contain NR_CPUS */
+};
+
+struct pcpu_alloc_info {
+       size_t                  static_size;
+       size_t                  reserved_size;
+       size_t                  dyn_size;
+       size_t                  unit_size;
+       size_t                  atom_size;
+       size_t                  alloc_size;
+       size_t                  __ai_size;      /* internal, don't use */
+       int                     nr_groups;      /* 0 if grouping unnecessary */
+       struct pcpu_group_info  groups[];
+};
+
+enum pcpu_fc {
+       PCPU_FC_AUTO,
+       PCPU_FC_EMBED,
+       PCPU_FC_PAGE,
+
+       PCPU_FC_NR,
+};
+extern const char *pcpu_fc_names[PCPU_FC_NR];
+
+extern enum pcpu_fc pcpu_chosen_fc;
+
+typedef void * (*pcpu_fc_alloc_fn_t)(unsigned int cpu, size_t size,
+                                    size_t align);
 typedef void (*pcpu_fc_free_fn_t)(void *ptr, size_t size);
 typedef void (*pcpu_fc_populate_pte_fn_t)(unsigned long addr);
-typedef void (*pcpu_fc_map_fn_t)(void *ptr, size_t size, void *addr);
+typedef int (pcpu_fc_cpu_distance_fn_t)(unsigned int from, unsigned int to);
 
-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 dyn_size, size_t unit_size,
-                               void *base_addr);
+extern struct pcpu_alloc_info * __init pcpu_alloc_alloc_info(int nr_groups,
+                                                            int nr_units);
+extern void __init pcpu_free_alloc_info(struct pcpu_alloc_info *ai);
 
-extern ssize_t __init pcpu_embed_first_chunk(
-                               size_t static_size, size_t reserved_size,
-                               ssize_t dyn_size);
+extern struct pcpu_alloc_info * __init pcpu_build_alloc_info(
+                               size_t reserved_size, ssize_t dyn_size,
+                               size_t atom_size,
+                               pcpu_fc_cpu_distance_fn_t cpu_distance_fn);
 
-extern ssize_t __init pcpu_4k_first_chunk(
-                               size_t static_size, size_t reserved_size,
-                               pcpu_fc_alloc_fn_t alloc_fn,
-                               pcpu_fc_free_fn_t free_fn,
-                               pcpu_fc_populate_pte_fn_t populate_pte_fn);
+extern int __init pcpu_setup_first_chunk(const struct pcpu_alloc_info *ai,
+                                        void *base_addr);
 
-#ifdef CONFIG_NEED_MULTIPLE_NODES
-extern ssize_t __init pcpu_lpage_first_chunk(
-                               size_t static_size, size_t reserved_size,
-                               ssize_t dyn_size, size_t lpage_size,
+#ifdef CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK
+extern int __init pcpu_embed_first_chunk(size_t reserved_size, ssize_t dyn_size,
+                               size_t atom_size,
+                               pcpu_fc_cpu_distance_fn_t cpu_distance_fn,
                                pcpu_fc_alloc_fn_t alloc_fn,
-                               pcpu_fc_free_fn_t free_fn,
-                               pcpu_fc_map_fn_t map_fn);
+                               pcpu_fc_free_fn_t free_fn);
+#endif
 
-extern void *pcpu_lpage_remapped(void *kaddr);
-#else
-static inline ssize_t __init pcpu_lpage_first_chunk(
-                               size_t static_size, size_t reserved_size,
-                               ssize_t dyn_size, size_t lpage_size,
+#ifdef CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK
+extern int __init pcpu_page_first_chunk(size_t reserved_size,
                                pcpu_fc_alloc_fn_t alloc_fn,
                                pcpu_fc_free_fn_t free_fn,
-                               pcpu_fc_map_fn_t map_fn)
-{
-       return -EINVAL;
-}
-
-static inline void *pcpu_lpage_remapped(void *kaddr)
-{
-       return NULL;
-}
+                               pcpu_fc_populate_pte_fn_t populate_pte_fn);
 #endif
 
 /*
@@ -164,6 +181,11 @@ static inline void free_percpu(void *p)
 
 static inline void __init setup_per_cpu_areas(void) { }
 
+static inline void *pcpu_lpage_remapped(void *kaddr)
+{
+       return NULL;
+}
+
 #endif /* CONFIG_SMP */
 
 #define alloc_percpu(type)     (type *)__alloc_percpu(sizeof(type), \