aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorAndi Kleen <andi@firstfloor.org>2009-12-16 06:19:57 -0500
committerAndi Kleen <ak@linux.intel.com>2009-12-16 06:19:57 -0500
commit82ba011b9041dd31c15e4f63797b08aa0a288e61 (patch)
tree7fd48d31ab507007c37f89a9dc41256b8585d8db /mm
parentbd1ce5f91f545730df4af492f774d9d32f5da3cb (diff)
HWPOISON: Turn ref argument into flags argument
Now that "ref" is just a boolean turn it into a flags argument. First step is only a single flag that makes the code's intention more clear, but more may follow. Signed-off-by: Andi Kleen <ak@linux.intel.com>
Diffstat (limited to 'mm')
-rw-r--r--mm/madvise.c2
-rw-r--r--mm/memory-failure.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/mm/madvise.c b/mm/madvise.c
index 18970aec0d2f..6ca34f0cd4aa 100644
--- a/mm/madvise.c
+++ b/mm/madvise.c
@@ -237,7 +237,7 @@ static int madvise_hwpoison(unsigned long start, unsigned long end)
237 printk(KERN_INFO "Injecting memory failure for page %lx at %lx\n", 237 printk(KERN_INFO "Injecting memory failure for page %lx at %lx\n",
238 page_to_pfn(p), start); 238 page_to_pfn(p), start);
239 /* Ignore return value for now */ 239 /* Ignore return value for now */
240 __memory_failure(page_to_pfn(p), 0, 1); 240 __memory_failure(page_to_pfn(p), 0, MF_COUNT_INCREASED);
241 } 241 }
242 return ret; 242 return ret;
243} 243}
diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 4253e14fa709..3338c443272c 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -737,7 +737,7 @@ static void hwpoison_user_mappings(struct page *p, unsigned long pfn,
737 ret != SWAP_SUCCESS, pfn); 737 ret != SWAP_SUCCESS, pfn);
738} 738}
739 739
740int __memory_failure(unsigned long pfn, int trapno, int ref) 740int __memory_failure(unsigned long pfn, int trapno, int flags)
741{ 741{
742 unsigned long lru_flag; 742 unsigned long lru_flag;
743 struct page_state *ps; 743 struct page_state *ps;
@@ -773,7 +773,8 @@ int __memory_failure(unsigned long pfn, int trapno, int ref)
773 * In fact it's dangerous to directly bump up page count from 0, 773 * In fact it's dangerous to directly bump up page count from 0,
774 * that may make page_freeze_refs()/page_unfreeze_refs() mismatch. 774 * that may make page_freeze_refs()/page_unfreeze_refs() mismatch.
775 */ 775 */
776 if (!ref && !get_page_unless_zero(compound_head(p))) { 776 if (!(flags & MF_COUNT_INCREASED) &&
777 !get_page_unless_zero(compound_head(p))) {
777 action_result(pfn, "free or high order kernel", IGNORED); 778 action_result(pfn, "free or high order kernel", IGNORED);
778 return PageBuddy(compound_head(p)) ? 0 : -EBUSY; 779 return PageBuddy(compound_head(p)) ? 0 : -EBUSY;
779 } 780 }