diff options
| author | Colin Cross <ccross@android.com> | 2010-10-20 14:39:20 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2010-10-20 14:39:20 -0700 |
| commit | 4ab096ce9c6532f3876d1cbb71462f7a7101003b (patch) | |
| tree | ceadc8a8f4f719d48c0ffe130df0c4df58a443e5 /mm | |
| parent | ae9a66ccf4bfcac9b6085cf9d62955f2712f82db (diff) | |
| parent | 0b313530b3fa263c5537a55703948a980f333388 (diff) | |
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Conflicts:
arch/arm/mach-tegra/tegra_i2s_audio.c
Change-Id: I3e05a70e3fb8fdaa8ca4c5ed78ca020c75ed0caa
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/memblock.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mm/memblock.c b/mm/memblock.c index 43840b305ecb..aa6919112842 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -196,6 +196,10 @@ static long memblock_add_region(struct memblock_region *rgn, u64 base, u64 size) long memblock_add(u64 base, u64 size) { struct memblock_region *_rgn = &memblock.memory; + u64 end = base + size; + + base = PAGE_ALIGN(base); + size = (end & PAGE_MASK) - base; /* On pSeries LPAR systems, the first MEMBLOCK is our RMO region. */ if (base == 0) |