From 614287496358f56798e41a1dacc1a589681dcd6f Mon Sep 17 00:00:00 2001 From: Ivan Kokshaysky Date: Thu, 15 Jan 2009 13:51:18 -0800 Subject: [PATCH] --- yaml --- r: 129690 b: refs/heads/master c: 2f88d151cb8e73587983d7feccd70672ff6730fe h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/alpha/kernel/sys_nautilus.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f87778b980cc..ee945bfa4bfe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 70b66cbfd3316b792a855cb9a2574e85f1a63d0f +refs/heads/master: 2f88d151cb8e73587983d7feccd70672ff6730fe diff --git a/trunk/arch/alpha/kernel/sys_nautilus.c b/trunk/arch/alpha/kernel/sys_nautilus.c index a7f23b5ab814..99c0f46f6b9c 100644 --- a/trunk/arch/alpha/kernel/sys_nautilus.c +++ b/trunk/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); }