aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2006-02-13 03:02:16 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-03-20 04:12:36 -0500
commit85dfa19ba92f88fa1c1482f655c7247119dfdcd5 (patch)
tree28038115f626e5c84bb50ad9ff5eed5dc943fcde /arch
parent059833eb817fec3a5a7f62fba9592749c4cebc73 (diff)
[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>
Diffstat (limited to 'arch')
-rw-r--r--arch/sparc64/kernel/entry.S12
-rw-r--r--arch/sparc64/kernel/pci_sun4v.h2
-rw-r--r--arch/sparc64/kernel/pci_sun4v_asm.S12
3 files changed, 12 insertions, 14 deletions
diff --git a/arch/sparc64/kernel/entry.S b/arch/sparc64/kernel/entry.S
index f51b66a1687a..fa185f227055 100644
--- a/arch/sparc64/kernel/entry.S
+++ b/arch/sparc64/kernel/entry.S
@@ -1695,3 +1695,15 @@ hard_smp_processor_id:
1695 retl 1695 retl
1696 nop 1696 nop
1697#endif 1697#endif
1698
1699 /* %o0: devhandle
1700 * %o1: devino
1701 *
1702 * returns %o0: sysino
1703 */
1704 .globl pci_sun4v_devino_to_sysino
1705sun4v_devino_to_sysino:
1706 mov HV_FAST_INTR_DEVINO2SYSINO, %o5
1707 ta HV_FAST_TRAP
1708 retl
1709 mov %o1, %o0
diff --git a/arch/sparc64/kernel/pci_sun4v.h b/arch/sparc64/kernel/pci_sun4v.h
index 00322ed0cf8a..88f199e11a71 100644
--- a/arch/sparc64/kernel/pci_sun4v.h
+++ b/arch/sparc64/kernel/pci_sun4v.h
@@ -6,8 +6,6 @@
6#ifndef _PCI_SUN4V_H 6#ifndef _PCI_SUN4V_H
7#define _PCI_SUN4V_H 7#define _PCI_SUN4V_H
8 8
9extern unsigned long pci_sun4v_devino_to_sysino(unsigned long devhandle,
10 unsigned long deino);
11extern unsigned long pci_sun4v_iommu_map(unsigned long devhandle, 9extern unsigned long pci_sun4v_iommu_map(unsigned long devhandle,
12 unsigned long tsbid, 10 unsigned long tsbid,
13 unsigned long num_ttes, 11 unsigned long num_ttes,
diff --git a/arch/sparc64/kernel/pci_sun4v_asm.S b/arch/sparc64/kernel/pci_sun4v_asm.S
index 4a12341dd5d3..424db6526648 100644
--- a/arch/sparc64/kernel/pci_sun4v_asm.S
+++ b/arch/sparc64/kernel/pci_sun4v_asm.S
@@ -6,18 +6,6 @@
6#include <asm/hypervisor.h> 6#include <asm/hypervisor.h>
7 7
8 /* %o0: devhandle 8 /* %o0: devhandle
9 * %o1: devino
10 *
11 * returns %o0: sysino
12 */
13 .globl pci_sun4v_devino_to_sysino
14pci_sun4v_devino_to_sysino:
15 mov HV_FAST_INTR_DEVINO2SYSINO, %o5
16 ta HV_FAST_TRAP
17 retl
18 mov %o1, %o0
19
20 /* %o0: devhandle
21 * %o1: tsbid 9 * %o1: tsbid
22 * %o2: num ttes 10 * %o2: num ttes
23 * %o3: io_attributes 11 * %o3: io_attributes