aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mm/slab.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/mm/slab.c b/mm/slab.c
index 9cc049a942c6..d66c2b0d9715 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -900,12 +900,18 @@ static void drain_alien_cache(struct kmem_cache *cachep, struct array_cache **al
900 } 900 }
901} 901}
902#else 902#else
903#define alloc_alien_cache(node, limit) do { } while (0) 903
904#define drain_alien_cache(cachep, alien) do { } while (0) 904#define drain_alien_cache(cachep, alien) do { } while (0)
905 905
906static inline struct array_cache **alloc_alien_cache(int node, int limit)
907{
908 return (struct array_cache **) 0x01020304ul;
909}
910
906static inline void free_alien_cache(struct array_cache **ac_ptr) 911static inline void free_alien_cache(struct array_cache **ac_ptr)
907{ 912{
908} 913}
914
909#endif 915#endif
910 916
911static int __devinit cpuup_callback(struct notifier_block *nfb, 917static int __devinit cpuup_callback(struct notifier_block *nfb,
@@ -970,11 +976,10 @@ static int __devinit cpuup_callback(struct notifier_block *nfb,
970 0xbaadf00d); 976 0xbaadf00d);
971 if (!shared) 977 if (!shared)
972 goto bad; 978 goto bad;
973#ifdef CONFIG_NUMA 979
974 alien = alloc_alien_cache(node, cachep->limit); 980 alien = alloc_alien_cache(node, cachep->limit);
975 if (!alien) 981 if (!alien)
976 goto bad; 982 goto bad;
977#endif
978 cachep->array[cpu] = nc; 983 cachep->array[cpu] = nc;
979 984
980 l3 = cachep->nodelists[node]; 985 l3 = cachep->nodelists[node];