From cd4420aea1d57c90eb1ff0362b5a3376a1564ee5 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Tue, 3 Jul 2007 13:58:03 -0700 Subject: [PATCH] --- yaml --- r: 58181 b: refs/heads/master c: f744a0547ac5055a3e9eb20bfe7ff29077a32c16 h: refs/heads/master i: 58179: 0f1950252e2bf2bc8979c9a352bb6178c6795f67 v: v3 --- [refs] | 2 +- trunk/kernel/time/ntp.c | 2 -- trunk/mm/slub.c | 8 ++++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1c37a4cb4a78..dd4cffd71e0e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1fb4a17f6e47d86b25bfc4fd9df4301bca09c999 +refs/heads/master: f744a0547ac5055a3e9eb20bfe7ff29077a32c16 diff --git a/trunk/kernel/time/ntp.c b/trunk/kernel/time/ntp.c index 87aa5ff931e0..cf53bb5814cb 100644 --- a/trunk/kernel/time/ntp.c +++ b/trunk/kernel/time/ntp.c @@ -122,7 +122,6 @@ void second_overflow(void) */ time_interpolator_update(-NSEC_PER_SEC); time_state = TIME_OOP; - clock_was_set(); printk(KERN_NOTICE "Clock: inserting leap second " "23:59:60 UTC\n"); } @@ -137,7 +136,6 @@ void second_overflow(void) */ time_interpolator_update(NSEC_PER_SEC); time_state = TIME_WAIT; - clock_was_set(); printk(KERN_NOTICE "Clock: deleting leap second " "23:59:59 UTC\n"); } diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c index 202049a45764..0437f2f09986 100644 --- a/trunk/mm/slub.c +++ b/trunk/mm/slub.c @@ -1798,8 +1798,6 @@ static struct kmem_cache_node * __init early_kmem_cache_node_alloc(gfp_t gfpflag BUG_ON(kmalloc_caches->size < sizeof(struct kmem_cache_node)); page = new_slab(kmalloc_caches, gfpflags | GFP_THISNODE, node); - /* new_slab() disables interupts */ - local_irq_enable(); BUG_ON(!page); n = page->freelist; @@ -1811,6 +1809,12 @@ static struct kmem_cache_node * __init early_kmem_cache_node_alloc(gfp_t gfpflag init_kmem_cache_node(n); atomic_long_inc(&n->nr_slabs); add_partial(n, page); + + /* + * new_slab() disables interupts. If we do not reenable interrupts here + * then bootup would continue with interrupts disabled. + */ + local_irq_enable(); return n; }