git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xhci: Fix register save/restore order.
[pandora-kernel.git]
/
mm
/
slab.c
diff --git
a/mm/slab.c
b/mm/slab.c
index
708efe8
..
83311c9
100644
(file)
--- a/
mm/slab.c
+++ b/
mm/slab.c
@@
-595,6
+595,7
@@
static enum {
PARTIAL_AC,
PARTIAL_L3,
EARLY,
PARTIAL_AC,
PARTIAL_L3,
EARLY,
+ LATE,
FULL
} g_cpucache_up;
FULL
} g_cpucache_up;
@@
-671,7
+672,7
@@
static void init_node_lock_keys(int q)
{
struct cache_sizes *s = malloc_sizes;
{
struct cache_sizes *s = malloc_sizes;
- if (g_cpucache_up
!= FULL
)
+ if (g_cpucache_up
< LATE
)
return;
for (s = malloc_sizes; s->cs_size != ULONG_MAX; s++) {
return;
for (s = malloc_sizes; s->cs_size != ULONG_MAX; s++) {
@@
-1666,6
+1667,8
@@
void __init kmem_cache_init_late(void)
{
struct kmem_cache *cachep;
{
struct kmem_cache *cachep;
+ g_cpucache_up = LATE;
+
/* Annotate slab for lockdep -- annotate the malloc caches */
init_lock_keys();
/* Annotate slab for lockdep -- annotate the malloc caches */
init_lock_keys();