From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755488AbcEXKJF (ORCPT ); Tue, 24 May 2016 06:09:05 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:52185 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753046AbcEXKJB (ORCPT ); Tue, 24 May 2016 06:09:01 -0400 From: Arnd Bergmann To: linaro-kernel@lists.linaro.org Cc: Yang Shi , akpm@linux-foundation.org, iamjoonsoo.kim@lge.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH] mm: fix build problems from lookup_page_ext Date: Tue, 24 May 2016 12:08:51 +0200 Message-ID: <6285269.2CksypHdYp@wuerfel> User-Agent: KMail/5.1.3 (Linux/4.4.0-22-generic; KDE/5.18.0; x86_64; ; ) In-Reply-To: <1464023768-31025-1-git-send-email-yang.shi@linaro.org> References: <1464023768-31025-1-git-send-email-yang.shi@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:aWkqlPYArz+6735+b0J9pl2YA3rnkavRiU06skToSe7P0tDTLYd xE7mHS7GW7RGGzkTtnEtZu8lvlS6XVfSfc7isLu/6mzG4kpKqGjMCeBDnyaM9cd/Dh4UzsD JFmjZyeajsaNnWoBJy6BX1qDoujTvOrOH+K1xQCDa1Ie/SHZABjQGWWMkqYfqSoXBB5vfOq cJvXYY8gN1PLJQKrFxTqQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:xioOzrgCadQ=:WDgR+BAIlAfxGSgbKl5+EQ fEyXabkot2Gc+z8OGI5uKnnAzprT+eOuSMaGg239D7A293L3+Ag/Iy5dEL837F7LsMHHjrvjF Ys1YM5Ssh9OzbB+gdUDns4ko4Tz6fFh5S0P9epO2ukh0CafcVOfWhRKGqKUNrtm3n1ZpWcZfA +DscciZ2ScONb9lUBv7iwZAREorLip9jwUaA8MygTspySCcn2Y+BR8Dk8C1jUAiY7xBmrRtdG gttRCFsuGXeUnT5XA/5VrVsL3soNHBmlkMXqixhL8neXBMPFMijuo/ZlWoxasK9UwjsqnL0xU ERsbnlbfML3vwEhTg8qXpP+zVLU83ri0CiDkfgR/+Zop0or3bA9jTs1H85B7B2NCm93CqiRee 0RRGhVXWLgVIiMUoEBT2tvxkuQxz/cbqSt+lyFpUuWngQchizbeHs4gyS6Fufy0uL3qZFItAg /ZrYrL647/3W2h42dl4eRbZzXsdlUr++pPA36Y1YDmxRlVDSehWIf2wCuaVYISbG0Zz9yQ4Hk lf4zzoYuidYFkF490TTIUV6aVziL/SoDHY7v1RIgQP5RIV90OuqFagAkKBngJ3m3nPK2F/mLE yGeVZeRmgEk0Ek8CWDE3rprXK0EDrk02S6YW+imQNrrGBTihjXs3tdE1NTBfqUPc+XHFjdGFI ZNk52VZDa8mBVJrFCVtwVsBaPWMNkjqyGvW0zdDnU5ZPnqAx8+IOtjUcVCCElX1I3IT9LN20Q Rw4CckvvdY8zeGiR Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A patch for lookup_page_ext introduced several build errors and warnings, e.g. mm/page_owner.c: In function '__set_page_owner': mm/page_owner.c:71:2: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement] include/linux/page_idle.h: In function 'set_page_young': include/linux/page_idle.h:62:3: error: expected ')' before 'return' This fixes all of them. Please fold into the original patch. Signed-off-by: Arnd Bergmann Fixes: 38c4fffbad3c ("mm: check the return value of lookup_page_ext for all call sites") diff --git a/include/linux/page_idle.h b/include/linux/page_idle.h index 569c3a180625..fec40271339f 100644 --- a/include/linux/page_idle.h +++ b/include/linux/page_idle.h @@ -48,7 +48,7 @@ static inline bool page_is_young(struct page *page) { struct page_ext *page_ext = lookup_page_ext(page); - if (unlikely(!page_ext) + if (unlikely(!page_ext)) return false; return test_bit(PAGE_EXT_YOUNG, &page_ext->flags); @@ -58,7 +58,7 @@ static inline void set_page_young(struct page *page) { struct page_ext *page_ext = lookup_page_ext(page); - if (unlikely(!page_ext) + if (unlikely(!page_ext)) return; set_bit(PAGE_EXT_YOUNG, &page_ext->flags); @@ -68,7 +68,7 @@ static inline bool test_and_clear_page_young(struct page *page) { struct page_ext *page_ext = lookup_page_ext(page); - if (unlikely(!page_ext) + if (unlikely(!page_ext)) return false; return test_and_clear_bit(PAGE_EXT_YOUNG, &page_ext->flags); @@ -78,7 +78,7 @@ static inline bool page_is_idle(struct page *page) { struct page_ext *page_ext = lookup_page_ext(page); - if (unlikely(!page_ext) + if (unlikely(!page_ext)) return false; return test_bit(PAGE_EXT_IDLE, &page_ext->flags); @@ -88,7 +88,7 @@ static inline void set_page_idle(struct page *page) { struct page_ext *page_ext = lookup_page_ext(page); - if (unlikely(!page_ext) + if (unlikely(!page_ext)) return; set_bit(PAGE_EXT_IDLE, &page_ext->flags); @@ -98,7 +98,7 @@ static inline void clear_page_idle(struct page *page) { struct page_ext *page_ext = lookup_page_ext(page); - if (unlikely(!page_ext) + if (unlikely(!page_ext)) return; clear_bit(PAGE_EXT_IDLE, &page_ext->flags); diff --git a/mm/page_owner.c b/mm/page_owner.c index 902e39813295..c6cda3e36212 100644 --- a/mm/page_owner.c +++ b/mm/page_owner.c @@ -65,9 +65,6 @@ void __set_page_owner(struct page *page, unsigned int order, gfp_t gfp_mask) { struct page_ext *page_ext = lookup_page_ext(page); - if (unlikely(!page_ext)) - return; - struct stack_trace trace = { .nr_entries = 0, .max_entries = ARRAY_SIZE(page_ext->trace_entries), @@ -75,6 +72,9 @@ void __set_page_owner(struct page *page, unsigned int order, gfp_t gfp_mask) .skip = 3, }; + if (unlikely(!page_ext)) + return; + save_stack_trace(&trace); page_ext->order = order; @@ -111,12 +111,11 @@ void __copy_page_owner(struct page *oldpage, struct page *newpage) { struct page_ext *old_ext = lookup_page_ext(oldpage); struct page_ext *new_ext = lookup_page_ext(newpage); + int i; if (unlikely(!old_ext || !new_ext)) return; - int i; - new_ext->order = old_ext->order; new_ext->gfp_mask = old_ext->gfp_mask; new_ext->nr_entries = old_ext->nr_entries; @@ -204,11 +203,6 @@ err: void __dump_page_owner(struct page *page) { struct page_ext *page_ext = lookup_page_ext(page); - if (unlikely(!page_ext)) { - pr_alert("There is not page extension available.\n"); - return; - } - struct stack_trace trace = { .nr_entries = page_ext->nr_entries, .entries = &page_ext->trace_entries[0], @@ -216,6 +210,11 @@ void __dump_page_owner(struct page *page) gfp_t gfp_mask = page_ext->gfp_mask; int mt = gfpflags_to_migratetype(gfp_mask); + if (unlikely(!page_ext)) { + pr_alert("There is not page extension available.\n"); + return; + } + if (!test_bit(PAGE_EXT_OWNER, &page_ext->flags)) { pr_alert("page_owner info is not active (free page?)\n"); return;