History

Merge branches 'core-urgent-for-linus' and 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

* '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

Linus Torvalds committed 14 years ago

Commit f14aa873 parents 7125fac 52cef18 550acb12 files · +8 −2Browse files

Unified · Split

2 files
  1. kernel/irq/manage.c +4 −1
  2. mm/slab.c +4 −1
kernel/irq/manage.c+4−1
@@ -623,8 +623,9 @@ static irqreturn_t irq_nested_primary_handler(int irq, void *dev_id) · 622 unmodified lines
623623
624624 static int irq_wait_for_interrupt(struct irqaction *action)
625625 {
626+ set_current_state(TASK_INTERRUPTIBLE);
627+
626628 while (!kthread_should_stop()) {
627− set_current_state(TASK_INTERRUPTIBLE);
628629
629630 if (test_and_clear_bit(IRQTF_RUNTHREAD,
630631 &action->thread_flags)) {
@@ -632,7 +633,9 @@ static int irq_wait_for_interrupt(struct irqaction *action) · 1 unmodified line
632633 return 0;
633634 }
634635 schedule();
636+ set_current_state(TASK_INTERRUPTIBLE);
635637 }
638+ __set_current_state(TASK_RUNNING);
636639 return -1;
637640 }
638641
mm/slab.c+4−1
@@ -595,6 +595,7 @@ static enum { · 594 unmodified lines
595595 PARTIAL_AC,
596596 PARTIAL_L3,
597597 EARLY,
598+ LATE,
598599 FULL
599600 } g_cpucache_up;
600601
@@ -671,7 +672,7 @@ static void init_node_lock_keys(int q) · 70 unmodified lines
671672 {
672673 struct cache_sizes *s = malloc_sizes;
673674
674− if (g_cpucache_up != FULL)
675+ if (g_cpucache_up < LATE)
675676 return;
676677
677678 for (s = malloc_sizes; s->cs_size != ULONG_MAX; s++) {
@@ -1666,6 +1667,8 @@ void __init kmem_cache_init_late(void) · 988 unmodified lines
16661667 {
16671668 struct kmem_cache *cachep;
16681669
1670+ g_cpucache_up = LATE;
1671+
16691672 /* Annotate slab for lockdep -- annotate the malloc caches */
16701673 init_lock_keys();
16711674

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t