Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 20061
b: refs/heads/master
c: fa93895
h: refs/heads/master
i:
  20059: b93bba6
v: v3
  • Loading branch information
Michael Ellerman authored and Paul Mackerras committed Feb 7, 2006
1 parent e803d6c commit 6755c8d
Show file tree
Hide file tree
Showing 2 changed files with 7 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: 3ea4807de7b2c5c903380ba2c2e7150bee942f42
refs/heads/master: fa93895329b87112cb1fd784db969e60b5b46af6
7 changes: 6 additions & 1 deletion trunk/arch/powerpc/kernel/prom.c
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,12 @@ void __init finish_device_tree(void)
size = 16;
finish_node(allnodes, &size, 1);
size -= 16;
end = start = (unsigned long) __va(lmb_alloc(size, 128));

if (0 == size)
end = start = 0;
else
end = start = (unsigned long)__va(lmb_alloc(size, 128));

finish_node(allnodes, &end, 0);
BUG_ON(end != start + size);

Expand Down

0 comments on commit 6755c8d

Please sign in to comment.