diff options
Diffstat (limited to 'mm/slub.c')
-rw-r--r-- | mm/slub.c | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -1798,8 +1798,6 @@ static struct kmem_cache_node * __init early_kmem_cache_node_alloc(gfp_t gfpflag | |||
1798 | BUG_ON(kmalloc_caches->size < sizeof(struct kmem_cache_node)); | 1798 | BUG_ON(kmalloc_caches->size < sizeof(struct kmem_cache_node)); |
1799 | 1799 | ||
1800 | page = new_slab(kmalloc_caches, gfpflags | GFP_THISNODE, node); | 1800 | page = new_slab(kmalloc_caches, gfpflags | GFP_THISNODE, node); |
1801 | /* new_slab() disables interupts */ | ||
1802 | local_irq_enable(); | ||
1803 | 1801 | ||
1804 | BUG_ON(!page); | 1802 | BUG_ON(!page); |
1805 | n = page->freelist; | 1803 | n = page->freelist; |
@@ -1811,6 +1809,12 @@ static struct kmem_cache_node * __init early_kmem_cache_node_alloc(gfp_t gfpflag | |||
1811 | init_kmem_cache_node(n); | 1809 | init_kmem_cache_node(n); |
1812 | atomic_long_inc(&n->nr_slabs); | 1810 | atomic_long_inc(&n->nr_slabs); |
1813 | add_partial(n, page); | 1811 | add_partial(n, page); |
1812 | |||
1813 | /* | ||
1814 | * new_slab() disables interupts. If we do not reenable interrupts here | ||
1815 | * then bootup would continue with interrupts disabled. | ||
1816 | */ | ||
1817 | local_irq_enable(); | ||
1814 | return n; | 1818 | return n; |
1815 | } | 1819 | } |
1816 | 1820 | ||