tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6

Linus Torvalds edb4a353 b954cbcb

+5
unified split
+5
arch/ia64/kernel/mca.c
··· 1016 1017 cmc_polling_enabled = 1; 1018 spin_unlock(&cmc_history_lock); 1019 schedule_work(&cmc_disable_work); 1020 1021 /*
··· 1016 1017 cmc_polling_enabled = 1; 1018 spin_unlock(&cmc_history_lock); 1019 + /* If we're being hit with CMC interrupts, we won't 1020 + * ever execute the schedule_work() below. Need to 1021 + * disable CMC interrupts on this processor now. 1022 + */ 1023 + ia64_mca_cmc_vector_disable(NULL); 1024 schedule_work(&cmc_disable_work); 1025 1026 /*