diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-28 03:36:21 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-28 03:36:21 -0500 |
| commit | 38a5d6736e7f714cc56d58692001e66dcbb98799 (patch) | |
| tree | 337d32375e10b04642013710c2c424514474b32c /mm/memblock.c | |
| parent | 0bfd95a2a104dfc2469d68de52df99939371c0d4 (diff) | |
| parent | f5412be599602124d2bdd49947b231dd77c0bf99 (diff) | |
Merge commit 'v2.6.38-rc6' into devicetree/next
Conflicts:
drivers/spi/pxa2xx_spi_pci.c
Diffstat (limited to 'mm/memblock.c')
| -rw-r--r-- | mm/memblock.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mm/memblock.c b/mm/memblock.c index bdba245d8afd..4618fda975a0 100644 --- a/mm/memblock.c +++ b/mm/memblock.c | |||
| @@ -137,8 +137,6 @@ static phys_addr_t __init_memblock memblock_find_base(phys_addr_t size, | |||
| 137 | 137 | ||
| 138 | BUG_ON(0 == size); | 138 | BUG_ON(0 == size); |
| 139 | 139 | ||
| 140 | size = memblock_align_up(size, align); | ||
| 141 | |||
| 142 | /* Pump up max_addr */ | 140 | /* Pump up max_addr */ |
| 143 | if (end == MEMBLOCK_ALLOC_ACCESSIBLE) | 141 | if (end == MEMBLOCK_ALLOC_ACCESSIBLE) |
| 144 | end = memblock.current_limit; | 142 | end = memblock.current_limit; |