diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2008-05-12 09:43:35 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 02:12:05 -0400 |
commit | 6e92a5a6151f4a467b8c1bde9123c0a9d1a63339 (patch) | |
tree | e1ca4bd225a27f369722e5e609b98d8dc31294b3 /arch/x86 | |
parent | 65280e613fada41704f35709b6c8952ca4b8750c (diff) |
x86: add sparse annotations to ioremap
arch/x86/mm/ioremap.c:308:11: error: incompatible types in comparison expression (different address spaces)
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/mm/ioremap.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index 2b2bb3f9b683..01d76426971d 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c | |||
@@ -318,8 +318,8 @@ void iounmap(volatile void __iomem *addr) | |||
318 | * vm_area and by simply returning an address into the kernel mapping | 318 | * vm_area and by simply returning an address into the kernel mapping |
319 | * of ISA space. So handle that here. | 319 | * of ISA space. So handle that here. |
320 | */ | 320 | */ |
321 | if (addr >= phys_to_virt(ISA_START_ADDRESS) && | 321 | if ((void __force *)addr >= phys_to_virt(ISA_START_ADDRESS) && |
322 | addr < phys_to_virt(ISA_END_ADDRESS)) | 322 | (void __force *)addr < phys_to_virt(ISA_END_ADDRESS)) |
323 | return; | 323 | return; |
324 | 324 | ||
325 | addr = (volatile void __iomem *) | 325 | addr = (volatile void __iomem *) |
@@ -332,7 +332,7 @@ void iounmap(volatile void __iomem *addr) | |||
332 | cpa takes care of the direct mappings. */ | 332 | cpa takes care of the direct mappings. */ |
333 | read_lock(&vmlist_lock); | 333 | read_lock(&vmlist_lock); |
334 | for (p = vmlist; p; p = p->next) { | 334 | for (p = vmlist; p; p = p->next) { |
335 | if (p->addr == addr) | 335 | if (p->addr == (void __force *)addr) |
336 | break; | 336 | break; |
337 | } | 337 | } |
338 | read_unlock(&vmlist_lock); | 338 | read_unlock(&vmlist_lock); |
@@ -346,7 +346,7 @@ void iounmap(volatile void __iomem *addr) | |||
346 | free_memtype(p->phys_addr, p->phys_addr + get_vm_area_size(p)); | 346 | free_memtype(p->phys_addr, p->phys_addr + get_vm_area_size(p)); |
347 | 347 | ||
348 | /* Finally remove it */ | 348 | /* Finally remove it */ |
349 | o = remove_vm_area((void *)addr); | 349 | o = remove_vm_area((void __force *)addr); |
350 | BUG_ON(p != o || o == NULL); | 350 | BUG_ON(p != o || o == NULL); |
351 | kfree(p); | 351 | kfree(p); |
352 | } | 352 | } |
@@ -365,7 +365,7 @@ void *xlate_dev_mem_ptr(unsigned long phys) | |||
365 | if (page_is_ram(start >> PAGE_SHIFT)) | 365 | if (page_is_ram(start >> PAGE_SHIFT)) |
366 | return __va(phys); | 366 | return __va(phys); |
367 | 367 | ||
368 | addr = (void *)ioremap(start, PAGE_SIZE); | 368 | addr = (void __force *)ioremap(start, PAGE_SIZE); |
369 | if (addr) | 369 | if (addr) |
370 | addr = (void *)((unsigned long)addr | (phys & ~PAGE_MASK)); | 370 | addr = (void *)((unsigned long)addr | (phys & ~PAGE_MASK)); |
371 | 371 | ||