diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2011-09-29 09:37:23 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-25 07:10:13 +0200 |
| commit | 1289deb9b5c151876feb594cd82984f3932982e8 (patch) | |
| tree | 1b591cdac9159f4ddf4c4ae062e7a44e5b41d10f /arch/arm | |
| parent | 62bf7928bfe312ec6cf829b06893eb5649ceaec5 (diff) | |
| download | kernel_samsung_aries-1289deb9b5c151876feb594cd82984f3932982e8.zip kernel_samsung_aries-1289deb9b5c151876feb594cd82984f3932982e8.tar.gz kernel_samsung_aries-1289deb9b5c151876feb594cd82984f3932982e8.tar.bz2 | |
ARM: 7113/1: mm: Align bank start to MAX_ORDER_NR_PAGES
commit 002ea9eefec98dada56fd5f8e432a4e8570c2a26 upstream.
The VM subsystem assumes that there are valid memmap entries from
the bank start aligned to MAX_ORDER_NR_PAGES.
On the Ux500 we have a lot of mem=N arguments on the commandline
triggering this bug several times over and causing kernel
oops messages.
Cc: Michael Bohan <mbohan@codeaurora.org>
Cc: Nicolas Pitre <nico@fluxnic.net>
Signed-off-by: Johan Palsson <johan.palsson@stericsson.com>
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mm/init.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index c19571c..4a4eba5 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -473,6 +473,13 @@ static void __init free_unused_memmap(struct meminfo *mi) */ bank_start = min(bank_start, ALIGN(prev_bank_end, PAGES_PER_SECTION)); +#else + /* + * Align down here since the VM subsystem insists that the + * memmap entries are valid from the bank start aligned to + * MAX_ORDER_NR_PAGES. + */ + bank_start = round_down(bank_start, MAX_ORDER_NR_PAGES); #endif /* * If we had a previous bank, and there is a space |