Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 114245
b: refs/heads/master
c: 79aa79b
h: refs/heads/master
i:
  114243: a7934c8
v: v3
  • Loading branch information
Julia Lawall authored and Linus Torvalds committed Oct 14, 2008
1 parent 375d303 commit 43822f5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 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: 56f26f7b78af36d0f048a9403084870d2ffb549f
refs/heads/master: 79aa79bac979323a8cb10438be16d29cf252167d
4 changes: 3 additions & 1 deletion trunk/arch/m68k/mm/kmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,10 @@ static struct vm_struct *get_io_area(unsigned long size)
for (p = &iolist; (tmp = *p) ; p = &tmp->next) {
if (size + addr < (unsigned long)tmp->addr)
break;
if (addr > KMAP_END-size)
if (addr > KMAP_END-size) {
kfree(area);
return NULL;
}
addr = tmp->size + (unsigned long)tmp->addr;
}
area->addr = (void *)addr;
Expand Down

0 comments on commit 43822f5

Please sign in to comment.