diff options
author | 2016-01-18 21:50:26 +0100 | |
---|---|---|
committer | 2016-01-20 09:21:41 -0800 | |
commit | 629d9d1cafbd49cb374561a5a7d7724c4d6b2567 (patch) | |
tree | e0d107e5041480d2097e8b02cad4f1ba563ddf58 /mm | |
parent | Merge tag 'platform-drivers-x86-v4.5-1' of git://git.infradead.org/users/dvha... (diff) | |
download | linux-629d9d1cafbd49cb374561a5a7d7724c4d6b2567.tar.gz linux-629d9d1cafbd49cb374561a5a7d7724c4d6b2567.tar.bz2 linux-629d9d1cafbd49cb374561a5a7d7724c4d6b2567.zip |
mm: avoid uninitialized variable in tracepoint
A newly added tracepoint in the hugepage code uses a variable in the
error handling that is not initialized at that point:
include/trace/events/huge_memory.h:81:230: error: 'isolated' may be used uninitialized in this function [-Werror=maybe-uninitialized]
The result is relatively harmless, as the trace data will in rare
cases contain incorrect data.
This works around the problem by adding an explicit initialization.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 7d2eba0557c1 ("mm: add tracepoint for scanning pages")
Reviewed-by: Ebru Akagunduz <ebru.akagunduz@gmail.com>
Acked-by: David Rientjes <rientjes@google.com>
Cc: Kirill A. Shutemov <kirill@shutemov.name>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/huge_memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 50342eff7960..b1cf73bc3b12 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2320,7 +2320,7 @@ static void collapse_huge_page(struct mm_struct *mm, pgtable_t pgtable; struct page *new_page; spinlock_t *pmd_ptl, *pte_ptl; - int isolated, result = 0; + int isolated = 0, result = 0; unsigned long hstart, hend; struct mem_cgroup *memcg; unsigned long mmun_start; /* For mmu_notifiers */ |