All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andy Whitcroft <apw@shadowen.org>
To: Andrew Morton <akpm@osdl.org>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] migrate_page_add mangled brackets during merge
Date: Wed, 18 Jan 2006 11:53:32 +0000	[thread overview]
Message-ID: <20060118115332.GA15951@shadowen.org> (raw)
In-Reply-To: 20060118005053.118f1abc.akpm@osdl.org

migrate_page_add mangled brackets during merge

It appears that there was some kind of merge mangle in migrate_page_add().
Sort out an extraneous bracket and a couple of spacing issues.

Signed-off-by: Andy Whitcroft <apw@shadowen.org>
---
 mempolicy.c |    4 +---
 1 files changed, 1 insertion(+), 3 deletions(-)
diff -upN reference/mm/mempolicy.c current/mm/mempolicy.c
--- reference/mm/mempolicy.c
+++ current/mm/mempolicy.c
@@ -533,17 +533,15 @@ long do_get_mempolicy(int *policy, nodem
 /*
  * page migration
  */
-
 static void migrate_page_add(struct page *page, struct list_head *pagelist,
 				unsigned long flags)
 {
 	/*
 	 * Avoid migrating a page that is shared with others.
 	 */
-	if ((flags & MPOL_MF_MOVE_ALL) || page_mapcount(page) ==1)
+	if ((flags & MPOL_MF_MOVE_ALL) || page_mapcount(page) == 1)
 		if (isolate_lru_page(page))
 			list_add(&page->lru, pagelist);
-	}
 }
 
 /*

  parent reply	other threads:[~2006-01-18 11:53 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-01-18  8:50 2.6.16-rc1-mm1 Andrew Morton
2006-01-18 10:45 ` [PATCH] mempolicy.c compile fix Dominik Karall
2006-01-18 10:55 ` 2.6.16-rc1-mm1 Dominik Karall
2006-01-18 13:19   ` snd_pcm_format_name() problems [Re: 2.6.16-rc1-mm1] Jiri Slaby
2006-01-18 11:10 ` 2.6.16-rc1-mm1 Reuben Farrelly
2006-01-18 11:27   ` 2.6.16-rc1-mm1 Andrew Morton
2006-01-18 19:09     ` 2.6.16-rc1-mm1 Dave Jones
2006-01-18 21:40       ` 2.6.16-rc1-mm1 Andrew Morton
2006-01-18 21:56         ` 2.6.16-rc1-mm1 Dave Jones
2006-01-18 23:13       ` 2.6.16-rc1-mm1 Alan Cox
2006-01-18 23:37         ` 2.6.16-rc1-mm1 Dave Jones
2006-01-19  7:16         ` 2.6.16-rc1-mm1 Arjan van de Ven
2006-01-18 11:53 ` Andy Whitcroft [this message]
2006-01-18 12:00 ` 2.6.16-rc1-mm1 Grant Coady
2006-01-18 12:41 ` 2.6.16-rc1-mm1 Reuben Farrelly
2006-01-18 22:29 ` Wireless issues (was 2.6.16-rc1-mm1 Valdis.Kletnieks
2006-01-18 22:56   ` Andrew Morton
2006-01-19  7:33     ` Valdis.Kletnieks
2006-01-19  9:33       ` Wireless issues (was Re: 2.6.16-rc1-mm1) Dominik Brodowski
2006-01-19  1:05 ` [-mm patch] make pcmcia_release_{io,irq} static Adrian Bunk
2006-01-19 11:14   ` Dominik Brodowski
2006-01-19  3:11 ` 2.6.16-rc1-mm1: ia64 compile error Adrian Bunk
2006-01-19  3:11   ` Adrian Bunk
2006-01-19  3:27   ` Greg KH
2006-01-19  3:27     ` Greg KH
2006-01-19  3:31   ` Mark Maule
2006-01-19  3:31     ` Mark Maule

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=20060118115332.GA15951@shadowen.org \
    --to=apw@shadowen.org \
    --cc=akpm@osdl.org \
    --cc=linux-kernel@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.