aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/sn/pci/tioca_provider.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-29 21:03:03 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-29 21:03:03 -0700
commit9b4311eedb17fa88f02e4876cd6aa9a08e383cd6 (patch)
tree59cbb1af2c6de429b88818441e31963ec0aad42b /arch/ia64/sn/pci/tioca_provider.c
parent2949ccf9379678df66ecf2ca70ed4656159eacdd (diff)
parent0647d8cfd40f7974335884d73deef83feeffc2a0 (diff)
downloadkernel_samsung_crespo-9b4311eedb17fa88f02e4876cd6aa9a08e383cd6.zip
kernel_samsung_crespo-9b4311eedb17fa88f02e4876cd6aa9a08e383cd6.tar.gz
kernel_samsung_crespo-9b4311eedb17fa88f02e4876cd6aa9a08e383cd6.tar.bz2
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'arch/ia64/sn/pci/tioca_provider.c')
-rw-r--r--arch/ia64/sn/pci/tioca_provider.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/ia64/sn/pci/tioca_provider.c b/arch/ia64/sn/pci/tioca_provider.c
index 8dae9eb..05aa8c2f 100644
--- a/arch/ia64/sn/pci/tioca_provider.c
+++ b/arch/ia64/sn/pci/tioca_provider.c
@@ -336,7 +336,7 @@ tioca_dma_d48(struct pci_dev *pdev, uint64_t paddr)
if (!ct_addr)
return 0;
- bus_addr = (dma_addr_t) (ct_addr & 0xffffffffffff);
+ bus_addr = (dma_addr_t) (ct_addr & 0xffffffffffffUL);
node_upper = ct_addr >> 48;
if (node_upper > 64) {
@@ -464,7 +464,7 @@ map_return:
* For mappings created using the direct modes (64 or 48) there are no
* resources to release.
*/
-void
+static void
tioca_dma_unmap(struct pci_dev *pdev, dma_addr_t bus_addr, int dir)
{
int i, entry;
@@ -514,7 +514,7 @@ tioca_dma_unmap(struct pci_dev *pdev, dma_addr_t bus_addr, int dir)
* The mapping mode used is based on the devices dma_mask. As a last resort
* use the GART mapped mode.
*/
-uint64_t
+static uint64_t
tioca_dma_map(struct pci_dev *pdev, uint64_t paddr, size_t byte_count)
{
uint64_t mapaddr;
@@ -580,7 +580,7 @@ tioca_error_intr_handler(int irq, void *arg, struct pt_regs *pt)
* On successful setup, returns the kernel version of tioca_common back to
* the caller.
*/
-void *
+static void *
tioca_bus_fixup(struct pcibus_bussoft *prom_bussoft)
{
struct tioca_common *tioca_common;