[SPARC64]: Move devino_to_sysino out of pci_sun4v_asm.S

It is not PCI specific, it is for all system interrupts.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/sparc64/kernel/entry.S b/arch/sparc64/kernel/entry.S
index f51b66a1687aa642ab6b5c3d0778a64e6ac5effa..fa185f22705586252c32d5c6b4165ad80d94d3a7 100644 (file)
--- a/arch/sparc64/kernel/entry.S
+++ b/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/arch/sparc64/kernel/pci_sun4v.h b/arch/sparc64/kernel/pci_sun4v.h
index 00322ed0cf8a095cbc0fe0b392a948fdfe226be8..88f199e11a71a7394977f9b6a830a4350046997d 100644 (file)
--- a/arch/sparc64/kernel/pci_sun4v.h
+++ b/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/arch/sparc64/kernel/pci_sun4v_asm.S b/arch/sparc64/kernel/pci_sun4v_asm.S
index 4a12341dd5d3395273a1b6aec6cc9070739945a3..424db652664897dcd935c3a4ef5e503f06a19fb8 100644 (file)
--- a/arch/sparc64/kernel/pci_sun4v_asm.S
+++ b/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/include/asm-sparc64/hypervisor.h b/include/asm-sparc64/hypervisor.h
index 5d795ee5192db5d74b015c45caa787f67d08ba87..16a40f48beb3fb7088ea39cbfe7ecec15816e7d5 100644 (file)
--- a/include/asm-sparc64/hypervisor.h
+++ b/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