diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-10 15:17:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-10 15:17:24 -0700 |
| commit | 7c283324da366a3e6ffaad4352a51a3c71fcae17 (patch) | |
| tree | b4d02c340a17ac5134889c4eec7dcd06d407e3ca /mm/nobootmem.c | |
| parent | 9e5869f8d70d94850cf86163c57ba8d4daa29924 (diff) | |
| parent | 17ff3c1fa4c7bd0c38d751715033023ebf32fc96 (diff) | |
| download | kernel_goldelico_gta04-7c283324da366a3e6ffaad4352a51a3c71fcae17.zip kernel_goldelico_gta04-7c283324da366a3e6ffaad4352a51a3c71fcae17.tar.gz kernel_goldelico_gta04-7c283324da366a3e6ffaad4352a51a3c71fcae17.tar.bz2 | |
Merge branch 'akpm' (Andrew's patch-bomb)
Merge misc fixes from Andrew Morton.
* emailed from Andrew Morton <akpm@linux-foundation.org>: (8 patches)
MAINTAINERS: add maintainer for LED subsystem
mm: nobootmem: fix sign extend problem in __free_pages_memory()
drivers/leds: correct __devexit annotations
memcg: free spare array to avoid memory leak
namespaces, pid_ns: fix leakage on fork() failure
hugetlb: prevent BUG_ON in hugetlb_fault() -> hugetlb_cow()
mm: fix division by 0 in percpu_pagelist_fraction()
proc/pid/pagemap: correctly report non-present ptes and holes between vmas
Diffstat (limited to 'mm/nobootmem.c')
| -rw-r--r-- | mm/nobootmem.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mm/nobootmem.c b/mm/nobootmem.c index e53bb8a..1983fb1 100644 --- a/mm/nobootmem.c +++ b/mm/nobootmem.c @@ -82,8 +82,7 @@ void __init free_bootmem_late(unsigned long addr, unsigned long size) static void __init __free_pages_memory(unsigned long start, unsigned long end) { - int i; - unsigned long start_aligned, end_aligned; + unsigned long i, start_aligned, end_aligned; int order = ilog2(BITS_PER_LONG); start_aligned = (start + (BITS_PER_LONG - 1)) & ~(BITS_PER_LONG - 1); |