The patch titled alpha: nautilus - fix hang on boot has been added to the -mm tree. Its filename is alpha-nautilus-fix-hang-on-boot.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: alpha: nautilus - fix hang on boot From: Ivan Kokshaysky <ink@xxxxxxxxxxxxxxxxxxxx> Recently introduced generic pci_common_swizzle() relies on bus->self being NULL for the root PCI bus. But on nautilus bus->self points to the host bridge device, which is necessary as we do a root bus sizing on this system. As a result, pci_common_swizzle() loops infinitely. This worked until 2.6.29-rc1 because the alpha-specific swizzle routine checked for bus->parent == NULL (instead of bus->self). Fixed by clearing bus->self after bus sizing is done. Signed-off-by: Ivan Kokshaysky <ink@xxxxxxxxxxxxxxxxxxxx> Cc: Richard Henderson <rth@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/alpha/kernel/sys_nautilus.c | 4 ++++ 1 file changed, 4 insertions(+) diff -puN arch/alpha/kernel/sys_nautilus.c~alpha-nautilus-fix-hang-on-boot arch/alpha/kernel/sys_nautilus.c --- a/arch/alpha/kernel/sys_nautilus.c~alpha-nautilus-fix-hang-on-boot +++ a/arch/alpha/kernel/sys_nautilus.c @@ -245,6 +245,10 @@ nautilus_init_pci(void) IRONGATE0->pci_mem = pci_mem; pci_bus_assign_resources(bus); + + /* pci_common_swizzle() relies on bus->self being NULL + for the root bus, so just clear it. */ + bus->self = NULL; pci_fixup_irqs(alpha_mv.pci_swizzle, alpha_mv.pci_map_irq); } _ Patches currently in -mm which might be from ink@xxxxxxxxxxxxxxxxxxxx are alpha-fix-vmalloc-breakage.patch alpha-fix-vmalloc-breakage-fix.patch alpha-nautilus-fix-compile-failure-with-gcc-43.patch alpha-nautilus-fix-hang-on-boot.patch alpha-fix-rtc-on-marvel.patch alpha-gitignore-vmlinuxlds.patch alpha-make-pte_alloc_one_kernel-inline.patch make-sure-nobodys-leaking-resources.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html