* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: slab, lockdep: Fix silly bug * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: genirq: Fix race condition when stopping the irq thread
Unified · Split
| @@ -623,8 +623,9 @@ static irqreturn_t irq_nested_primary_handler(int irq, void *dev_id) · 622 unmodified lines | ||
| 623 | 623 | |
| 624 | 624 | static int irq_wait_for_interrupt(struct irqaction *action) |
| 625 | 625 | { |
| 626 | + set_current_state(TASK_INTERRUPTIBLE); | |
| 627 | + | |
| 626 | 628 | while (!kthread_should_stop()) { |
| 627 | − set_current_state(TASK_INTERRUPTIBLE); | |
| 628 | 629 | |
| 629 | 630 | if (test_and_clear_bit(IRQTF_RUNTHREAD, |
| 630 | 631 | &action->thread_flags)) { |
| @@ -632,7 +633,9 @@ static int irq_wait_for_interrupt(struct irqaction *action) · 1 unmodified line | ||
| 632 | 633 | return 0; |
| 633 | 634 | } |
| 634 | 635 | schedule(); |
| 636 | + set_current_state(TASK_INTERRUPTIBLE); | |
| 635 | 637 | } |
| 638 | + __set_current_state(TASK_RUNNING); | |
| 636 | 639 | return -1; |
| 637 | 640 | } |
| 638 | 641 | |
| @@ -595,6 +595,7 @@ static enum { · 594 unmodified lines | ||
| 595 | 595 | PARTIAL_AC, |
| 596 | 596 | PARTIAL_L3, |
| 597 | 597 | EARLY, |
| 598 | + LATE, | |
| 598 | 599 | FULL |
| 599 | 600 | } g_cpucache_up; |
| 600 | 601 | |
| @@ -671,7 +672,7 @@ static void init_node_lock_keys(int q) · 70 unmodified lines | ||
| 671 | 672 | { |
| 672 | 673 | struct cache_sizes *s = malloc_sizes; |
| 673 | 674 | |
| 674 | − if (g_cpucache_up != FULL) | |
| 675 | + if (g_cpucache_up < LATE) | |
| 675 | 676 | return; |
| 676 | 677 | |
| 677 | 678 | for (s = malloc_sizes; s->cs_size != ULONG_MAX; s++) { |
| @@ -1666,6 +1667,8 @@ void __init kmem_cache_init_late(void) · 988 unmodified lines | ||
| 1666 | 1667 | { |
| 1667 | 1668 | struct kmem_cache *cachep; |
| 1668 | 1669 | |
| 1670 | + g_cpucache_up = LATE; | |
| 1671 | + | |
| 1669 | 1672 | /* Annotate slab for lockdep -- annotate the malloc caches */ |
| 1670 | 1673 | init_lock_keys(); |
| 1671 | 1674 | |