Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / include / linux / genalloc.h

diff --git a/include/linux/genalloc.h b/include/linux/genalloc.h
index 690c428..7fd0576 100644 (file)
--- a/include/linux/genalloc.h
+++ b/include/linux/genalloc.h
@@ -4,32 +4,37 @@
  * Uses for this includes on-device special memory, uncached memory
  * etc.
  *
  * Uses for this includes on-device special memory, uncached memory
  * etc.
  *

+ * This code is based on the buddy allocator found in the sym53c8xx_2
+ * driver, adapted for general purpose use.
+ *

  * This source code is licensed under the GNU General Public License,
  * Version 2.  See the file COPYING for more details.
  */
 
  * This source code is licensed under the GNU General Public License,
  * Version 2.  See the file COPYING for more details.
  */
 

+#include <linux/spinlock.h>

 
 

+#define ALLOC_MIN_SHIFT                5 /* 32 bytes minimum */

 /*
 /*

- *  General purpose special memory pool descriptor.
+ *  Link between free memory chunks of a given size.

  */
  */

-struct gen_pool {
-       rwlock_t lock;
-       struct list_head chunks;        /* list of chunks in this pool */
-       int min_alloc_order;            /* minimum allocation order */
+struct gen_pool_link {
+       struct gen_pool_link *next;

 };
 
 /*
 };
 
 /*

- *  General purpose special memory pool chunk descriptor.
+ *  Memory pool descriptor.

  */
  */

-struct gen_pool_chunk {
+struct gen_pool {

        spinlock_t lock;
        spinlock_t lock;

-       struct list_head next_chunk;    /* next chunk in pool */
-       unsigned long start_addr;       /* starting address of memory chunk */
-       unsigned long end_addr;         /* ending address of memory chunk */
-       unsigned long bits[0];          /* bitmap for allocating memory chunk */
+       unsigned long (*get_new_chunk)(struct gen_pool *);
+       struct gen_pool *next;
+       struct gen_pool_link *h;
+       unsigned long private;
+       int max_chunk_shift;

 };
 
 };
 

-extern struct gen_pool *gen_pool_create(int, int);
-extern int gen_pool_add(struct gen_pool *, unsigned long, size_t, int);
-extern unsigned long gen_pool_alloc(struct gen_pool *, size_t);
-extern void gen_pool_free(struct gen_pool *, unsigned long, size_t);
+unsigned long gen_pool_alloc(struct gen_pool *poolp, int size);
+void gen_pool_free(struct gen_pool *mp, unsigned long ptr, int size);
+struct gen_pool *gen_pool_create(int nr_chunks, int max_chunk_shift,
+                                unsigned long (*fp)(struct gen_pool *),
+                                unsigned long data);