Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 116508
b: refs/heads/master
c: 9e6cad9
h: refs/heads/master
v: v3
  • Loading branch information
Yinghai Lu authored and Ingo Molnar committed Oct 16, 2008
1 parent 4caf198 commit b1e5b0f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 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: 3c2cbd2490656fb4b6ede586c557a2b09811a432
refs/heads/master: 9e6cad9b1230b5563c4b38335bf1ed0f73c5d74a
6 changes: 2 additions & 4 deletions trunk/init/dyn_array.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,9 @@ void __init pre_alloc_dyn_array(void)

/* allocate them all together */
max_align = max_t(unsigned long, max_align, PAGE_SIZE);
ptr = __alloc_bootmem_nopanic(total_size, max_align, 0);
if (!ptr)
panic("Can not alloc dyn_alloc\n");

ptr = __alloc_bootmem(total_size, max_align, 0);
phys = virt_to_phys(ptr);

for (daa = __dyn_array_start ; daa < __dyn_array_end; daa++) {
struct dyn_array *da = *daa;

Expand Down

0 comments on commit b1e5b0f

Please sign in to comment.