From 5d8e89e6f209220402e9d5d232051b838e34f4ae Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Mon, 9 Aug 2010 17:19:52 -0700 Subject: [PATCH] --- yaml --- r: 207271 b: refs/heads/master c: 57250a5bf0f6ff68dc339572adbd881a11f366fa h: refs/heads/master i: 207269: 5cada8eb59798fe1039f746e22fdc0b6b626432f 207267: 8d9ae0fb2d24b4ecf80b107c6fbfd838e2e2c9fa 207263: c27daef788edfcf74bc1d7b15597f523ccbf3109 v: v3 --- [refs] | 2 +- trunk/mm/memory.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 216bfbce93ed..d1171238678e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 58c37f6e0dfaaab85a3c11fcbf24451dfe70c721 +refs/heads/master: 57250a5bf0f6ff68dc339572adbd881a11f366fa diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c index 1ecca56e0a48..858829d06a92 100644 --- a/trunk/mm/memory.c +++ b/trunk/mm/memory.c @@ -2006,11 +2006,10 @@ int apply_to_page_range(struct mm_struct *mm, unsigned long addr, { pgd_t *pgd; unsigned long next; - unsigned long start = addr, end = addr + size; + unsigned long end = addr + size; int err; BUG_ON(addr >= end); - mmu_notifier_invalidate_range_start(mm, start, end); pgd = pgd_offset(mm, addr); do { next = pgd_addr_end(addr, end); @@ -2018,7 +2017,7 @@ int apply_to_page_range(struct mm_struct *mm, unsigned long addr, if (err) break; } while (pgd++, addr = next, addr != end); - mmu_notifier_invalidate_range_end(mm, start, end); + return err; } EXPORT_SYMBOL_GPL(apply_to_page_range);