aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
Diffstat (limited to 'mm')
-rw-r--r--mm/slab.c4
-rw-r--r--mm/slub.c5
2 files changed, 0 insertions, 9 deletions
diff --git a/mm/slab.c b/mm/slab.c
index 7bc4a136846..39d20f8a079 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -139,10 +139,6 @@
139#define BYTES_PER_WORD sizeof(void *) 139#define BYTES_PER_WORD sizeof(void *)
140#define REDZONE_ALIGN max(BYTES_PER_WORD, __alignof__(unsigned long long)) 140#define REDZONE_ALIGN max(BYTES_PER_WORD, __alignof__(unsigned long long))
141 141
142#ifndef cache_line_size
143#define cache_line_size() L1_CACHE_BYTES
144#endif
145
146#ifndef ARCH_KMALLOC_MINALIGN 142#ifndef ARCH_KMALLOC_MINALIGN
147/* 143/*
148 * Enforce a minimum alignment for the kmalloc caches. 144 * Enforce a minimum alignment for the kmalloc caches.
diff --git a/mm/slub.c b/mm/slub.c
index 48fff83a1e9..38914bc64ac 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -207,11 +207,6 @@ static inline void ClearSlabDebug(struct page *page)
207#define __KMALLOC_CACHE 0x20000000 /* objects freed using kfree */ 207#define __KMALLOC_CACHE 0x20000000 /* objects freed using kfree */
208#define __PAGE_ALLOC_FALLBACK 0x10000000 /* Allow fallback to page alloc */ 208#define __PAGE_ALLOC_FALLBACK 0x10000000 /* Allow fallback to page alloc */
209 209
210/* Not all arches define cache_line_size */
211#ifndef cache_line_size
212#define cache_line_size() L1_CACHE_BYTES
213#endif
214
215static int kmem_size = sizeof(struct kmem_cache); 210static int kmem_size = sizeof(struct kmem_cache);
216 211
217#ifdef CONFIG_SMP 212#ifdef CONFIG_SMP