git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'x86/numa-fixes', 'x86/apic', 'x86/apm', 'x86/bitops', 'x86/build...
[safe/jmp/linux-2.6]
/
arch
/
x86
/
mm
/
ioremap.c
diff --git
a/arch/x86/mm/ioremap.c
b/arch/x86/mm/ioremap.c
index
2b2bb3f
..
416ea41
100644
(file)
--- a/
arch/x86/mm/ioremap.c
+++ b/
arch/x86/mm/ioremap.c
@@
-142,7
+142,7
@@
static void __iomem *__ioremap_caller(resource_size_t phys_addr,
/*
* Don't remap the low PCI/ISA area, it's always mapped..
*/
/*
* Don't remap the low PCI/ISA area, it's always mapped..
*/
- if (
phys_addr >= ISA_START_ADDRESS && last_addr < ISA_END_ADDRESS
)
+ if (
is_ISA_range(phys_addr, last_addr)
)
return (__force void __iomem *)phys_to_virt(phys_addr);
/*
return (__force void __iomem *)phys_to_virt(phys_addr);
/*
@@
-261,7
+261,7
@@
void __iomem *ioremap_nocache(resource_size_t phys_addr, unsigned long size)
{
/*
* Ideally, this should be:
{
/*
* Ideally, this should be:
- * pat_
wc_
enabled ? _PAGE_CACHE_UC : _PAGE_CACHE_UC_MINUS;
+ * pat_enabled ? _PAGE_CACHE_UC : _PAGE_CACHE_UC_MINUS;
*
* Till we fix all X drivers to use ioremap_wc(), we will use
* UC MINUS.
*
* Till we fix all X drivers to use ioremap_wc(), we will use
* UC MINUS.
@@
-285,7
+285,7
@@
EXPORT_SYMBOL(ioremap_nocache);
*/
void __iomem *ioremap_wc(unsigned long phys_addr, unsigned long size)
{
*/
void __iomem *ioremap_wc(unsigned long phys_addr, unsigned long size)
{
- if (pat_
wc_
enabled)
+ if (pat_enabled)
return __ioremap_caller(phys_addr, size, _PAGE_CACHE_WC,
__builtin_return_address(0));
else
return __ioremap_caller(phys_addr, size, _PAGE_CACHE_WC,
__builtin_return_address(0));
else
@@
-318,8
+318,8
@@
void iounmap(volatile void __iomem *addr)
* vm_area and by simply returning an address into the kernel mapping
* of ISA space. So handle that here.
*/
* vm_area and by simply returning an address into the kernel mapping
* of ISA space. So handle that here.
*/
- if (addr >= phys_to_virt(ISA_START_ADDRESS) &&
- addr < phys_to_virt(ISA_END_ADDRESS))
+ if (
(void __force *)
addr >= phys_to_virt(ISA_START_ADDRESS) &&
+
(void __force *)
addr < phys_to_virt(ISA_END_ADDRESS))
return;
addr = (volatile void __iomem *)
return;
addr = (volatile void __iomem *)
@@
-332,7
+332,7
@@
void iounmap(volatile void __iomem *addr)
cpa takes care of the direct mappings. */
read_lock(&vmlist_lock);
for (p = vmlist; p; p = p->next) {
cpa takes care of the direct mappings. */
read_lock(&vmlist_lock);
for (p = vmlist; p; p = p->next) {
- if (p->addr == addr)
+ if (p->addr ==
(void __force *)
addr)
break;
}
read_unlock(&vmlist_lock);
break;
}
read_unlock(&vmlist_lock);
@@
-346,7
+346,7
@@
void iounmap(volatile void __iomem *addr)
free_memtype(p->phys_addr, p->phys_addr + get_vm_area_size(p));
/* Finally remove it */
free_memtype(p->phys_addr, p->phys_addr + get_vm_area_size(p));
/* Finally remove it */
- o = remove_vm_area((void *)addr);
+ o = remove_vm_area((void
__force
*)addr);
BUG_ON(p != o || o == NULL);
kfree(p);
}
BUG_ON(p != o || o == NULL);
kfree(p);
}
@@
-365,7
+365,7
@@
void *xlate_dev_mem_ptr(unsigned long phys)
if (page_is_ram(start >> PAGE_SHIFT))
return __va(phys);
if (page_is_ram(start >> PAGE_SHIFT))
return __va(phys);
- addr = (void *)ioremap(start, PAGE_SIZE);
+ addr = (void
__force
*)ioremap(start, PAGE_SIZE);
if (addr)
addr = (void *)((unsigned long)addr | (phys & ~PAGE_MASK));
if (addr)
addr = (void *)((unsigned long)addr | (phys & ~PAGE_MASK));