summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2007-03-16 05:44:03 +0100
committerDavid S. Miller <davem@sunset.davemloft.net>2007-04-26 10:55:35 +0200
commit0f3e25049e0a54916d0991c1eaa5f8df926c7f92 (patch)
tree5307777ecb878310274e9406497c69080d775f91 /arch
parent[SPARC64]: Use bootmem_bootmap_pages() in choose_bootmap_pfn(). (diff)
downloadlinux-0f3e25049e0a54916d0991c1eaa5f8df926c7f92.tar.xz
linux-0f3e25049e0a54916d0991c1eaa5f8df926c7f92.zip
[SPARC64]: Make sure pbm->prom_node is setup easly enough in psycho.c
It needs to be ready before we invoke pci_determine_mem_io_space(). Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/sparc64/kernel/pci_psycho.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/pci_psycho.c b/arch/sparc64/kernel/pci_psycho.c
index 154c03290d5d..3725910c8b2b 100644
--- a/arch/sparc64/kernel/pci_psycho.c
+++ b/arch/sparc64/kernel/pci_psycho.c
@@ -1107,8 +1107,6 @@ static void psycho_pbm_init(struct pci_controller_info *p,
if (prop)
pbm->chip_revision = *(int *) prop->value;
- pci_determine_mem_io_space(pbm);
-
pbm->parent = p;
pbm->prom_node = dp;
pbm->name = dp->full_name;
@@ -1117,6 +1115,8 @@ static void psycho_pbm_init(struct pci_controller_info *p,
pbm->name,
pbm->chip_version, pbm->chip_revision);
+ pci_determine_mem_io_space(pbm);
+
prop = of_find_property(dp, "bus-range", NULL);
busrange = prop->value;
pbm->pci_first_busno = busrange[0];