---

yaml --- r: 21428 b: refs/heads/master c: 0b52249 h: refs/heads/master v: v3
git-mirror · Mar 20, 2006 · eb87811 · eb87811
1 parent c20bfc8
commit eb87811
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c26092675020ff495a16dd635bf1733215325540
+refs/heads/master: 0b522497a176f222ae4cf7e6733a5357352224b2
diff --git a/trunk/arch/sparc64/kernel/pci_sun4v.c b/trunk/arch/sparc64/kernel/pci_sun4v.c
@@ -916,8 +916,10 @@ void sun4v_pci_init(int node, char *model_name)
 		       &p->pbm_A :
 		       &p->pbm_B);
 
-		if (pbm->devhandle == (devhandle ^ 0x40))
+		if (pbm->devhandle == (devhandle ^ 0x40)) {
 			pci_sun4v_pbm_init(p, node, devhandle);
+			return;
+		}
 	}
 
 	p = kmalloc(sizeof(struct pci_controller_info), GFP_ATOMIC);
@@ -961,7 +963,4 @@ void sun4v_pci_init(int node, char *model_name)
 	pci_memspace_mask = 0x7fffffffUL;
 
 	pci_sun4v_pbm_init(p, node, devhandle);
-
-	prom_printf("sun4v_pci_init: Implement me.\n");
-	prom_halt();
 }