|
@@ -201,17 +201,6 @@ struct kmem_cache {
|
|
|
#ifndef KMALLOC_SHIFT_LOW
|
|
|
#define KMALLOC_SHIFT_LOW 5
|
|
|
#endif
|
|
|
-
|
|
|
-/*
|
|
|
- * This restriction comes from byte sized index implementation.
|
|
|
- * Page size is normally 2^12 bytes and, in this case, if we want to use
|
|
|
- * byte sized index which can represent 2^8 entries, the size of the object
|
|
|
- * should be equal or greater to 2^12 / 2^8 = 2^4 = 16.
|
|
|
- * If minimum size of kmalloc is less than 16, we use it as minimum object
|
|
|
- * size and give up to use byte sized index.
|
|
|
- */
|
|
|
-#define SLAB_OBJ_MIN_SIZE (KMALLOC_SHIFT_LOW < 4 ? \
|
|
|
- (1 << KMALLOC_SHIFT_LOW) : 16)
|
|
|
#endif
|
|
|
|
|
|
#ifdef CONFIG_SLUB
|
|
@@ -253,6 +242,17 @@ struct kmem_cache {
|
|
|
#define KMALLOC_MIN_SIZE (1 << KMALLOC_SHIFT_LOW)
|
|
|
#endif
|
|
|
|
|
|
+/*
|
|
|
+ * This restriction comes from byte sized index implementation.
|
|
|
+ * Page size is normally 2^12 bytes and, in this case, if we want to use
|
|
|
+ * byte sized index which can represent 2^8 entries, the size of the object
|
|
|
+ * should be equal or greater to 2^12 / 2^8 = 2^4 = 16.
|
|
|
+ * If minimum size of kmalloc is less than 16, we use it as minimum object
|
|
|
+ * size and give up to use byte sized index.
|
|
|
+ */
|
|
|
+#define SLAB_OBJ_MIN_SIZE (KMALLOC_MIN_SIZE < 16 ? \
|
|
|
+ (KMALLOC_MIN_SIZE) : 16)
|
|
|
+
|
|
|
#ifndef CONFIG_SLOB
|
|
|
extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];
|
|
|
#ifdef CONFIG_ZONE_DMA
|