From: Ingo Molnar <mingo@kernel.org>
Date: Fri, 1 Nov 2013 07:10:58 +0000 (+0100)
Subject: Merge branch 'linus' into sched/core
X-Git-Tag: MMI-PSA29.97-13-9~13342^2~8
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fb10d5b7efbcc0aa9e46a9aa5ad86772c7bacb9a;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'linus' into sched/core

Resolve cherry-picking conflicts:

Conflicts:
	mm/huge_memory.c
	mm/memory.c
	mm/mprotect.c

See this upstream merge commit for more details:

  52469b4fcd4f Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

fb10d5b7efbcc0aa9e46a9aa5ad86772c7bacb9a
diff --cc arch/arm/include/asm/Kbuild
index 4e6838d4ddf6,59ceae8f3c95..1a7024b41351
--- a/arch/arm/include/asm/Kbuild
+++ b/arch/arm/include/asm/Kbuild
@@@ -31,6 -31,4 +31,5 @@@ generic-y += termbits.
  generic-y += termios.h
  generic-y += timex.h
  generic-y += trace_clock.h
- generic-y += types.h
  generic-y += unaligned.h
 +generic-y += preempt.h
diff --cc mm/mprotect.c
index a0302ac0be98,412ba2b7326a..a597f2ffcd6f
--- a/mm/mprotect.c
+++ b/mm/mprotect.c
@@@ -89,11 -100,12 +90,13 @@@ static unsigned long change_pte_range(s
  				 * just be safe and disable write
  				 */
  				make_migration_entry_read(&entry);
- 				set_pte_at(mm, addr, pte,
- 					swp_entry_to_pte(entry));
+ 				newpte = swp_entry_to_pte(entry);
+ 				if (pte_swp_soft_dirty(oldpte))
+ 					newpte = pte_swp_mksoft_dirty(newpte);
+ 				set_pte_at(mm, addr, pte, newpte);
 +
 +				pages++;
  			}
 -			pages++;
  		}
  	} while (pte++, addr += PAGE_SIZE, addr != end);
  	arch_leave_lazy_mmu_mode();