git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
alpha
/
kernel
/
core_irongate.c
diff --git
a/arch/alpha/kernel/core_irongate.c
b/arch/alpha/kernel/core_irongate.c
index
8659900
..
e4a0bcf
100644
(file)
--- a/
arch/alpha/kernel/core_irongate.c
+++ b/
arch/alpha/kernel/core_irongate.c
@@
-287,9
+287,9
@@
irongate_init_arch(void)
hose->sparse_mem_base = 0;
hose->sparse_io_base = 0;
hose->dense_mem_base
hose->sparse_mem_base = 0;
hose->sparse_io_base = 0;
hose->dense_mem_base
- = (IRONGATE_MEM & 0xffffffffff
) | 0x80000000000
;
+ = (IRONGATE_MEM & 0xffffffffff
UL) | 0x80000000000UL
;
hose->dense_io_base
hose->dense_io_base
- = (IRONGATE_IO & 0xffffffffff
) | 0x80000000000
;
+ = (IRONGATE_IO & 0xffffffffff
UL) | 0x80000000000UL
;
hose->sg_isa = hose->sg_pci = NULL;
__direct_map_base = 0;
hose->sg_isa = hose->sg_pci = NULL;
__direct_map_base = 0;
@@
-310,7
+310,7
@@
irongate_init_arch(void)
#define GET_GATT_OFF(addr) ((addr & 0x003ff000) >> 12)
#define GET_GATT(addr) (gatt_pages[GET_PAGE_DIR_IDX(addr)])
#define GET_GATT_OFF(addr) ((addr & 0x003ff000) >> 12)
#define GET_GATT(addr) (gatt_pages[GET_PAGE_DIR_IDX(addr)])
-unsigned long
+void __iomem *
irongate_ioremap(unsigned long addr, unsigned long size)
{
struct vm_struct *area;
irongate_ioremap(unsigned long addr, unsigned long size)
{
struct vm_struct *area;
@@
-320,7
+320,7
@@
irongate_ioremap(unsigned long addr, unsigned long size)
unsigned long gart_bus_addr;
if (!alpha_agpgart_size)
unsigned long gart_bus_addr;
if (!alpha_agpgart_size)
- return
addr + IRONGATE_MEM
;
+ return
(void __iomem *)(addr + IRONGATE_MEM)
;
gart_bus_addr = (unsigned long)IRONGATE0->bar0 &
PCI_BASE_ADDRESS_MEM_MASK;
gart_bus_addr = (unsigned long)IRONGATE0->bar0 &
PCI_BASE_ADDRESS_MEM_MASK;
@@
-339,7
+339,7
@@
irongate_ioremap(unsigned long addr, unsigned long size)
/*
* Not found - assume legacy ioremap
*/
/*
* Not found - assume legacy ioremap
*/
- return
addr + IRONGATE_MEM
;
+ return
(void __iomem *)(addr + IRONGATE_MEM)
;
} while(0);
mmio_regs = (u32 *)(((unsigned long)IRONGATE0->bar1 &
} while(0);
mmio_regs = (u32 *)(((unsigned long)IRONGATE0->bar1 &
@@
-353,7
+353,7
@@
irongate_ioremap(unsigned long addr, unsigned long size)
if (addr & ~PAGE_MASK) {
printk("AGP ioremap failed... addr not page aligned (0x%lx)\n",
addr);
if (addr & ~PAGE_MASK) {
printk("AGP ioremap failed... addr not page aligned (0x%lx)\n",
addr);
- return
addr + IRONGATE_MEM
;
+ return
(void __iomem *)(addr + IRONGATE_MEM)
;
}
last = addr + size - 1;
size = PAGE_ALIGN(last) - addr;
}
last = addr + size - 1;
size = PAGE_ALIGN(last) - addr;
@@
-378,7
+378,7
@@
irongate_ioremap(unsigned long addr, unsigned long size)
* Map it
*/
area = get_vm_area(size, VM_IOREMAP);
* Map it
*/
area = get_vm_area(size, VM_IOREMAP);
- if (!area) return
(unsigned long)
NULL;
+ if (!area) return NULL;
for(baddr = addr, vaddr = (unsigned long)area->addr;
baddr <= last;
for(baddr = addr, vaddr = (unsigned long)area->addr;
baddr <= last;
@@
-391,7
+391,7
@@
irongate_ioremap(unsigned long addr, unsigned long size)
pte, PAGE_SIZE, 0)) {
printk("AGP ioremap: FAILED to map...\n");
vfree(area->addr);
pte, PAGE_SIZE, 0)) {
printk("AGP ioremap: FAILED to map...\n");
vfree(area->addr);
- return
(unsigned long)
NULL;
+ return NULL;
}
}
}
}
@@
-402,13
+402,17
@@
irongate_ioremap(unsigned long addr, unsigned long size)
printk("irongate_ioremap(0x%lx, 0x%lx) returning 0x%lx\n",
addr, size, vaddr);
#endif
printk("irongate_ioremap(0x%lx, 0x%lx) returning 0x%lx\n",
addr, size, vaddr);
#endif
- return vaddr;
+ return
(void __iomem *)
vaddr;
}
}
+EXPORT_SYMBOL(irongate_ioremap);
void
void
-irongate_iounmap(
unsigned long
addr)
+irongate_iounmap(
volatile void __iomem *x
addr)
{
{
+ unsigned long addr = (unsigned long) xaddr;
if (((long)addr >> 41) == -2)
return; /* kseg map, nothing to do */
if (((long)addr >> 41) == -2)
return; /* kseg map, nothing to do */
- if (addr) return vfree((void *)(PAGE_MASK & addr));
+ if (addr)
+ return vfree((void *)(PAGE_MASK & addr));
}
}
+EXPORT_SYMBOL(irongate_iounmap);