---

yaml --- r: 21430 b: refs/heads/master c: 85dfa19 h: refs/heads/master v: v3
git-mirror · Mar 20, 2006 · 1ddbd97 · 1ddbd97
1 parent ce299eb
commit 1ddbd97
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 15 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 059833eb817fec3a5a7f62fba9592749c4cebc73
+refs/heads/master: 85dfa19ba92f88fa1c1482f655c7247119dfdcd5
diff --git a/trunk/arch/sparc64/kernel/entry.S b/trunk/arch/sparc64/kernel/entry.S
@@ -1695,3 +1695,15 @@ hard_smp_processor_id:
 	retl
 	 nop
 #endif
+
+	/* %o0: devhandle
+	 * %o1:	devino
+	 *
+	 * returns %o0: sysino
+	 */
+	.globl	pci_sun4v_devino_to_sysino
+sun4v_devino_to_sysino:
+	mov	HV_FAST_INTR_DEVINO2SYSINO, %o5
+	ta	HV_FAST_TRAP
+	retl
+	 mov	%o1, %o0
diff --git a/trunk/arch/sparc64/kernel/pci_sun4v.h b/trunk/arch/sparc64/kernel/pci_sun4v.h
@@ -6,8 +6,6 @@
 #ifndef _PCI_SUN4V_H
 #define _PCI_SUN4V_H
 
-extern unsigned long pci_sun4v_devino_to_sysino(unsigned long devhandle,
-						unsigned long deino);
 extern unsigned long pci_sun4v_iommu_map(unsigned long devhandle,
 					 unsigned long tsbid,
 					 unsigned long num_ttes,

diff --git a/trunk/arch/sparc64/kernel/pci_sun4v_asm.S b/trunk/arch/sparc64/kernel/pci_sun4v_asm.S
@@ -5,18 +5,6 @@
 
 #include <asm/hypervisor.h>
 
-	/* %o0: devhandle
-	 * %o1:	devino
-	 *
-	 * returns %o0: sysino
-	 */
-	.globl	pci_sun4v_devino_to_sysino
-pci_sun4v_devino_to_sysino:
-	mov	HV_FAST_INTR_DEVINO2SYSINO, %o5
-	ta	HV_FAST_TRAP
-	retl
-	 mov	%o1, %o0
-
 	/* %o0: devhandle
 	 * %o1:	tsbid
 	 * %o2:	num ttes

diff --git a/trunk/include/asm-sparc64/hypervisor.h b/trunk/include/asm-sparc64/hypervisor.h
@@ -1203,6 +1203,11 @@ struct hv_trap_trace_entry {
  */
 #define HV_FAST_INTR_DEVINO2SYSINO	0xa0
 
+#ifndef __ASSEMBLY__
+extern unsigned long sun4v_devino_to_sysino(unsigned long devhandle,
+					    unsigned long devino);
+#endif
+
 /* intr_getenabled()
  * TRAP:	HV_FAST_TRAP
  * FUNCTION:	HV_FAST_INTR_GETENABLED