From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751409AbdCPCDW (ORCPT ); Wed, 15 Mar 2017 22:03:22 -0400 Received: from smtprelay0091.hostedemail.com ([216.40.44.91]:45014 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751239AbdCPCCb (ORCPT ); Wed, 15 Mar 2017 22:02:31 -0400 X-Session-Marker: 6A6F6540706572636865732E636F6D X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,joe@perches.com,:::::,RULES_HIT:41:355:379:541:800:960:966:973:988:989:1260:1345:1359:1534:1542:1711:1730:1747:1777:1792:2196:2198:2199:2200:2393:2559:2562:2731:3138:3139:3140:3141:3142:3352:3876:3877:4321:4385:5007:6114:6261:6642:7903:9040:10004:10848:11026:11473:11658:11914:12043:12438:12555:12895:12986:14096:14181:14394:14721:21080:21094:21323:30012:30054,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:1,LUA_SUMMARY:none X-HE-Tag: woman87_6b87b9a763d19 X-Filterd-Recvd-Size: 2983 From: Joe Perches To: Andrew Morton , linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org Subject: [PATCH 15/15] mm: page_alloc: Move logical continuations to EOL Date: Wed, 15 Mar 2017 19:00:12 -0700 Message-Id: X-Mailer: git-send-email 2.10.0.rc2.1.g053435c In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Just more code style conformance/neatening. Signed-off-by: Joe Perches --- mm/page_alloc.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 930773b03b26..011a8e057639 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -859,9 +859,9 @@ static inline void __free_one_page(struct page *page, buddy = page + (buddy_pfn - pfn); buddy_mt = get_pageblock_migratetype(buddy); - if (migratetype != buddy_mt - && (is_migrate_isolate(migratetype) || - is_migrate_isolate(buddy_mt))) + if (migratetype != buddy_mt && + (is_migrate_isolate(migratetype) || + is_migrate_isolate(buddy_mt))) goto done_merging; } max_order++; @@ -2115,8 +2115,9 @@ static void reserve_highatomic_pageblock(struct page *page, struct zone *zone, /* Yoink! */ mt = get_pageblock_migratetype(page); - if (!is_migrate_highatomic(mt) && !is_migrate_isolate(mt) - && !is_migrate_cma(mt)) { + if (!is_migrate_highatomic(mt) && + !is_migrate_isolate(mt) && + !is_migrate_cma(mt)) { zone->nr_reserved_highatomic += pageblock_nr_pages; set_pageblock_migratetype(page, MIGRATE_HIGHATOMIC); move_freepages_block(zone, page, MIGRATE_HIGHATOMIC, NULL); @@ -2682,8 +2683,9 @@ int __isolate_free_page(struct page *page, unsigned int order) for (; page < endpage; page += pageblock_nr_pages) { int mt = get_pageblock_migratetype(page); - if (!is_migrate_isolate(mt) && !is_migrate_cma(mt) - && !is_migrate_highatomic(mt)) + if (!is_migrate_isolate(mt) && + !is_migrate_cma(mt) && + !is_migrate_highatomic(mt)) set_pageblock_migratetype(page, MIGRATE_MOVABLE); } @@ -3791,8 +3793,8 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order, */ if (can_direct_reclaim && (costly_order || - (order > 0 && ac->migratetype != MIGRATE_MOVABLE)) - && !gfp_pfmemalloc_allowed(gfp_mask)) { + (order > 0 && ac->migratetype != MIGRATE_MOVABLE)) && + !gfp_pfmemalloc_allowed(gfp_mask)) { page = __alloc_pages_direct_compact(gfp_mask, order, alloc_flags, ac, INIT_COMPACT_PRIORITY, -- 2.10.0.rc2.1.g053435c