git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mm: compaction: direct compact when a high-order allocation fails
[safe/jmp/linux-2.6]
/
mm
/
slob.c
diff --git
a/mm/slob.c
b/mm/slob.c
index
64f6db1
..
23631e2
100644
(file)
--- a/
mm/slob.c
+++ b/
mm/slob.c
@@
-133,17
+133,17
@@
static LIST_HEAD(free_slob_large);
*/
static inline int is_slob_page(struct slob_page *sp)
{
*/
static inline int is_slob_page(struct slob_page *sp)
{
- return PageSl
obPage
((struct page *)sp);
+ return PageSl
ab
((struct page *)sp);
}
static inline void set_slob_page(struct slob_page *sp)
{
}
static inline void set_slob_page(struct slob_page *sp)
{
- __SetPageSl
obPage
((struct page *)sp);
+ __SetPageSl
ab
((struct page *)sp);
}
static inline void clear_slob_page(struct slob_page *sp)
{
}
static inline void clear_slob_page(struct slob_page *sp)
{
- __ClearPageSl
obPage
((struct page *)sp);
+ __ClearPageSl
ab
((struct page *)sp);
}
static inline struct slob_page *slob_page(const void *addr)
}
static inline struct slob_page *slob_page(const void *addr)
@@
-467,14
+467,6
@@
out:
* End of slob allocator proper. Begin kmem_cache_alloc and kmalloc frontend.
*/
* End of slob allocator proper. Begin kmem_cache_alloc and kmalloc frontend.
*/
-#ifndef ARCH_KMALLOC_MINALIGN
-#define ARCH_KMALLOC_MINALIGN __alignof__(unsigned long)
-#endif
-
-#ifndef ARCH_SLAB_MINALIGN
-#define ARCH_SLAB_MINALIGN __alignof__(unsigned long)
-#endif
-
void *__kmalloc_node(size_t size, gfp_t gfp, int node)
{
unsigned int *m;
void *__kmalloc_node(size_t size, gfp_t gfp, int node)
{
unsigned int *m;
@@
-595,6
+587,8
@@
EXPORT_SYMBOL(kmem_cache_create);
void kmem_cache_destroy(struct kmem_cache *c)
{
kmemleak_free(c);
void kmem_cache_destroy(struct kmem_cache *c)
{
kmemleak_free(c);
+ if (c->flags & SLAB_DESTROY_BY_RCU)
+ rcu_barrier();
slob_free(c, sizeof(struct kmem_cache));
}
EXPORT_SYMBOL(kmem_cache_destroy);
slob_free(c, sizeof(struct kmem_cache));
}
EXPORT_SYMBOL(kmem_cache_destroy);
@@
-690,3
+684,8
@@
void __init kmem_cache_init(void)
{
slob_ready = 1;
}
{
slob_ready = 1;
}
+
+void __init kmem_cache_init_late(void)
+{
+ /* Nothing to do */
+}