Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 4204
b: refs/heads/master
c: c23a4e9
h: refs/heads/master
v: v3
  • Loading branch information
Andrew Morton authored and Linus Torvalds committed Jul 8, 2005
1 parent 9d94edc commit 29aaf7f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: eda80228860641b7b0e963e6bd219b960c500af9
refs/heads/master: c23a4e9649f80a9379d7df4a33bc63b365d5e7fc
6 changes: 4 additions & 2 deletions trunk/arch/i386/mm/ioremap.c
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,8 @@ EXPORT_SYMBOL(ioremap_nocache);
void iounmap(volatile void __iomem *addr)
{
struct vm_struct *p;
if ((void __force *) addr <= high_memory)

if ((void __force *)addr <= high_memory)
return;

/*
Expand All @@ -241,9 +242,10 @@ void iounmap(volatile void __iomem *addr)
return;

write_lock(&vmlist_lock);
p = __remove_vm_area((void *) (PAGE_MASK & (unsigned long __force) addr));
p = __remove_vm_area((void *)(PAGE_MASK & (unsigned long __force)addr));
if (!p) {
printk(KERN_WARNING "iounmap: bad address %p\n", addr);
dump_stack();
goto out_unlock;
}

Expand Down

0 comments on commit 29aaf7f

Please sign in to comment.