From: Joe Perches <joe@perches.com>
To: Andrew Morton <akpm@linux-foundation.org>, 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 [thread overview]
Message-ID: <e52a03ab25e1ad4cabdbfea09947a0f7ba5e4c48.1489628477.git.joe@perches.com> (raw)
In-Reply-To: <cover.1489628477.git.joe@perches.com>
Just more code style conformance/neatening.
Signed-off-by: Joe Perches <joe@perches.com>
---
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
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
prev parent reply other threads:[~2017-03-16 2:02 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-16 1:59 [PATCH 00/15] mm: page_alloc: style neatenings Joe Perches
2017-03-16 1:59 ` [PATCH 01/15] mm: page_alloc: whitespace neatening Joe Perches
2017-03-16 1:59 ` [PATCH 02/15] mm: page_alloc: align arguments to parenthesis Joe Perches
2017-03-16 8:02 ` Michal Hocko
2017-03-16 10:29 ` Joe Perches
2017-03-16 10:33 ` Michal Hocko
2017-03-16 2:00 ` [PATCH 03/15] mm: page_alloc: fix brace positions Joe Perches
2017-03-16 2:00 ` [PATCH 04/15] mm: page_alloc: fix blank lines Joe Perches
2017-03-16 2:00 ` [PATCH 05/15] mm: page_alloc: Move __meminitdata and __initdata uses Joe Perches
2017-03-16 2:00 ` [PATCH 06/15] mm: page_alloc: Use unsigned int instead of unsigned Joe Perches
2017-03-16 2:00 ` [PATCH 07/15] mm: page_alloc: Move labels to column 1 Joe Perches
2017-03-16 2:00 ` [PATCH 08/15] mm: page_alloc: Fix typo acording -> according & the the -> to the Joe Perches
2017-03-16 2:00 ` [PATCH 09/15] mm: page_alloc: Use the common commenting style Joe Perches
2017-03-16 2:00 ` [PATCH 10/15] mm: page_alloc: 80 column neatening Joe Perches
2017-03-16 8:59 ` Sergey Senozhatsky
2017-03-16 2:00 ` [PATCH 11/15] mm: page_alloc: Move EXPORT_SYMBOL uses Joe Perches
2017-03-16 2:00 ` [PATCH 12/15] mm: page_alloc: Avoid pointer comparisons to NULL Joe Perches
2017-03-16 2:00 ` [PATCH 13/15] mm: page_alloc: Remove unnecessary parentheses Joe Perches
2017-03-16 2:00 ` [PATCH 14/15] mm: page_alloc: Use octal permissions Joe Perches
2017-03-16 2:00 ` Joe Perches [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e52a03ab25e1ad4cabdbfea09947a0f7ba5e4c48.1489628477.git.joe@perches.com \
--to=joe@perches.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox